| 1 | NO CONTENT: modified file |
|
NO CONTENT: modified file |
| @@ -39,7 +39,7 | |||||
| 39 | <span class="icon-bar"></span> |
|
39 | <span class="icon-bar"></span> | |
| 40 | <span class="icon-bar"></span> |
|
40 | <span class="icon-bar"></span> | |
| 41 | </button> |
|
41 | </button> | |
| 42 |
<a class="navbar-brand" href="{% url 'index' %}" style="padding-top:1px"><img class="logo" alt="JRO" src="{% static "images/logo-jro- |
|
42 | <a class="navbar-brand" href="{% url 'index' %}" style="padding-top:1px"><img class="logo" alt="JRO" src="{% static "images/logo-jro-color-trans.png" %}"></a> | |
| 43 | </div> |
|
43 | </div> | |
| 44 | <div class="collapse navbar-collapse" id="navigationbar"> |
|
44 | <div class="collapse navbar-collapse" id="navigationbar"> | |
| 45 |
<ul class="nav navbar-nav"> |
|
45 | <ul class="nav navbar-nav"> | |
| @@ -89,7 +89,12 | |||||
| 89 | <div class="container"> |
|
89 | <div class="container"> | |
| 90 | <div id="page" class="row" style="min-height:600px"> |
|
90 | <div id="page" class="row" style="min-height:600px"> | |
| 91 |
|
91 | |||
|
|
92 | {% if no_sidebar %} | |||
|
|
93 | <div class="col-md-0 hidden-xs hidden-sm" role="complementary"> | |||
|
|
94 | ||||
|
|
95 | {% else %} | |||
| 92 |
|
|
96 | <div class="col-md-3 hidden-xs hidden-sm" role="complementary"> | |
|
|
97 | {% endif %} | |||
| 93 | <br><br> |
|
98 | <br><br> | |
| 94 | <div id="sidebar"> |
|
99 | <div id="sidebar"> | |
| 95 |
{% block sidebar%} |
|
100 | {% block sidebar%} | |
| @@ -97,7 +102,11 | |||||
| 97 | </div> |
|
102 | </div> | |
| 98 | </div> |
|
103 | </div> | |
| 99 |
|
104 | |||
|
|
105 | {% if no_sidebar %} | |||
|
|
106 | <div class="col-md-12 col-xs-12" role="main"> | |||
|
|
107 | {% else %} | |||
| 100 |
|
|
108 | <div class="col-md-9 col-xs-12" role="main"> | |
|
|
109 | {% endif %} | |||
| 101 | <div class="page-header"> |
|
110 | <div class="page-header"> | |
| 102 | <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1> |
|
111 | <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1> | |
| 103 | </div> |
|
112 | </div> | |
| @@ -117,6 +126,7 | |||||
| 117 |
|
126 | |||
| 118 | </div> |
|
127 | </div> | |
| 119 |
|
128 | |||
|
|
129 | ||||
| 120 |
</div><!--/row--> |
|
130 | </div><!--/row--> | |
| 121 | </div> <!-- container --> |
|
131 | </div> <!-- container --> | |
| 122 |
|
132 | |||
| @@ -140,4 +150,3 | |||||
| 140 | {% endblock%} |
|
150 | {% endblock%} | |
| 141 | </body> |
|
151 | </body> | |
| 142 | </html> |
|
152 | </html> | |
| 143 |
|
||||
General Comments 0
You need to be logged in to leave comments.
Login now