Download as
Browse Code »

Commit c6c3451e16bd7ff0bace17bb541ee5e45cf48891

Authored by Zambom
1 parent 771d68bc
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Adjusting settings menu

Showing 3 changed files with 80 additions and 29 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @c6c3451
@@ -121,6 +121,52 @@ @@ -121,6 +121,52 @@
121 } 121 }
122 /* End NavBar Top */ 122 /* End NavBar Top */
123 123
  124 +/* Dropdown menu Topbar */
  125 +.dropdown-menu {
  126 + background: #F5F5F5;
  127 +}
  128 +
  129 +.dropdown-menu li > a {
  130 + background: #F5F5F5;
  131 + font-family: Roboto;
  132 + font-size: 16px;
  133 + color: #333333;
  134 +}
  135 +.dropdown-menu li > a:hover {
  136 + background: #EEEEEE !important;
  137 +}
  138 +
  139 +#system_accordion {
  140 + margin-bottom: 0px;
  141 +}
  142 +
  143 +#system_accordion > .panel > .panel-heading {
  144 + background: #F5F5F5;
  145 +}
  146 +#system_accordion > .panel > .panel-heading:hover {
  147 + background: #EEEEEE;
  148 +}
  149 +
  150 +#system_accordion > .panel > .panel-heading > a > .panel-title {
  151 + font-weight: normal;
  152 + color: #333333;
  153 +}
  154 +#system_accordion > .panel > .panel-heading > a > .panel-title:hover {
  155 + color: #009688;
  156 +}
  157 +#system_accordion > .panel > .panel-heading > a:hover {
  158 + text-decoration: none;
  159 + color: #009688;
  160 +}
  161 +#system_accordion > .panel > .panel-heading > a:focus {
  162 + text-decoration: none;
  163 +}
  164 +
  165 +#system_menu {
  166 + background: #F5F5F5;
  167 +}
  168 +/* End Dropdown menu Topbar */
  169 +
124 /* Modal */ 170 /* Modal */
125 .modal-header {min-height: 60px; border-bottom: 1px solid #E6E7E8 !important; padding-bottom: 15px !important;} 171 .modal-header {min-height: 60px; border-bottom: 1px solid #E6E7E8 !important; padding-bottom: 15px !important;}
126 .modal-footer {text-align: right; padding-top: 5px !important; border-top: 1px solid #E6E7E8 !important;} 172 .modal-footer {text-align: right; padding-top: 5px !important; border-top: 1px solid #E6E7E8 !important;}
amadeus/static/js/main.js
  Diff comments   View file @c6c3451
@@ -2,4 +2,14 @@ var locale = navigator.language || navigator.userLanguage; @@ -2,4 +2,14 @@ var locale = navigator.language || navigator.userLanguage;
2 2
3 $('.date-picker').datepicker({ 3 $('.date-picker').datepicker({
4 language: locale, 4 language: locale,
  5 +});
  6 +
  7 +$(function () {
  8 + //Dropdown menu collapse
  9 + $('a[data-toggle="collapse"]').on('click', function (event) {
  10 + event.preventDefault();
  11 + event.stopPropagation();
  12 + $($(this).data('parent')).find('.panel-collapse.in').collapse('hide');
  13 + $($(this).attr('href')).collapse('show');
  14 + });
5 }); 15 });
6 \ No newline at end of file 16 \ No newline at end of file
amadeus/templates/base.html
  Diff comments   View file @c6c3451
@@ -88,32 +88,31 @@ @@ -88,32 +88,31 @@
88 </form> 88 </form>
89 </div> 89 </div>
90 <ul class="nav navbar-nav navbar-right notifications"> 90 <ul class="nav navbar-nav navbar-right notifications">
91 - <!--<li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">  
92 - <a class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>-  
93 - <ul id="notification-dropdown" class="dropdown-menu">  
94 - <li class="dropdown-header"> {% trans 'Notifications' %}</li>  
95 -  
96 - <li>  
97 - <a onclick="getNotifications(5)">  
98 - <div id="notification-see-more" class="list-group-item">  
99 - <div class="row-content">  
100 - <p class="list-group-item-text">{% trans 'See More' %}</p>  
101 - </div>  
102 - </div>  
103 - </a>  
104 - </li>  
105 - </ul>  
106 - </li> -->  
107 - <li title data-original-title="{% trans 'settings' %}">  
108 - <a href="" data-toggle="dropdown"><i class="fa fa-cog" aria-hidden="true"></i></a>  
109 - <ul class="dropdown-menu pull-right"> 91 + <li class="dropdown-accordion dropdown" data-accordion="#system_accordion" title data-original-title="{% trans 'settings' %}">
  92 + <a href="#" data-toggle="dropdown"><i class="fa fa-cog" aria-hidden="true"></i></a>
  93 + <ul class="dropdown-menu pull-right" role="menu">
110 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> 94 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
111 <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li> 95 <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
112 - <li><a href="{% url 'categories:index' %}">{% trans 'System' %}</a></li>  
113 - <div id="horizontal-line"></div>  
114 - <li><a href="{% url 'categories:index' %}">{% trans 'Mail Sender' %}</a></li>  
115 - <li><a href="{% url 'categories:index' %}">{% trans 'Security' %}</a></li>  
116 - <li><a href="{% url 'categories:index' %}">{% trans 'Theme' %}</a></li> 96 + <li>
  97 + <div class="panel-group" id="system_accordion">
  98 + <div class="panel panel-default">
  99 + <div class="panel-heading">
  100 + <a href="#system_menu" data-toggle="collapse" data-parent="#system_accordion">
  101 + <h4 class="panel-title">
  102 + {% trans 'System' %}
  103 + </h4>
  104 + </a>
  105 + </div>
  106 + <div class="panel-collapse collapse" id="system_menu">
  107 + <div class="panel-body">
  108 + <a href="{% url 'categories:index' %}">{% trans 'Mail Sender' %}</a><br />
  109 + <a href="{% url 'categories:index' %}">{% trans 'Security' %}</a><br />
  110 + <a href="{% url 'categories:index' %}">{% trans 'Theme' %}</a>
  111 + </div>
  112 + </div>
  113 + </div>
  114 + </div>
  115 + </li>
117 </ul> 116 </ul>
118 </li> 117 </li>
119 <li title data-original-title="{% trans 'account' %}"> 118 <li title data-original-title="{% trans 'account' %}">
@@ -156,10 +155,6 @@ @@ -156,10 +155,6 @@
156 <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}"> 155 <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}">
157 <i class="fa fa-bar-chart" aria-hidden="true"></i> 156 <i class="fa fa-bar-chart" aria-hidden="true"></i>
158 </li> 157 </li>
159 -  
160 -  
161 -  
162 -  
163 </ul> 158 </ul>
164 {% endblock %} 159 {% endblock %}
165 </div> 160 </div>
@@ -188,7 +183,7 @@ @@ -188,7 +183,7 @@
188 /* Initialize tooltips*/ 183 /* Initialize tooltips*/
189 $(function () { 184 $(function () {
190 $('[data-toggle="tooltip"]').tooltip() 185 $('[data-toggle="tooltip"]').tooltip()
191 - }) 186 + });
192 </script> 187 </script>
193 </body> 188 </body>
194 189