Download as
Browse Code »

Commit e46b9491091b73b43c3b2de2c429457460319a4e

Authored by Jose Guilherme
2 parents 6beb1813 334f579e
Exists in master and in 2 other branches amadeus_univasf, refactoring

Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Showing 5 changed files with 51 additions and 28 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @e46b949
... ... @@ -122,7 +122,12 @@
122 122 }
123 123  
124 124 .navbar-header{
125   - width: 100% !important;
  125 + width: 100%;
  126 + position: fixed;
  127 + top: 0px;
  128 + z-index: 999;
  129 + height: 50px;
  130 + background: #009C8A;
126 131 }
127 132  
128 133 .navbar .navbar-brand{
... ... @@ -298,13 +303,11 @@
298 303 padding:10px;
299 304 }
300 305  
301   - .btn{
302   - padding: 0px 10px;
303   - margin: 10px 1px;
304   - }
305 306  
306 307 #btn-search {
307 308 font-size: 1.5em;
  309 + padding: 0px 10px;
  310 + margin: 10px 1px;
308 311 }
309 312 .navbar .logo{
310 313 margin: auto;
... ...
amadeus/static/css/themes/contrast.css
  Diff comments   View file @e46b949
... ... @@ -305,6 +305,10 @@ fieldset[disabled][disabled] .input-group-btn .btn {
305 305 background: #FFF333 !important;
306 306 color: #000000 !important; }
307 307  
  308 +.navbar-header{
  309 + background: #FFF333 !important;
  310 + color: #000000 !important; }
  311 +}
308 312 .navbar-nav li.settings_menu_active {
309 313 background: #FFF333; }
310 314  
... ...
amadeus/static/js/chat.js
  Diff comments   View file @e46b949
... ... @@ -208,7 +208,12 @@ function setChatFormSubmit() {
208 208 var frm = $('#chat-form'),
209 209 error_msg = frm.data('error');
210 210  
211   - frm.submit(function () {
  211 + frm.submit(function (e) {
  212 + var btn = frm.parent().parent().find("button[form='chat-form']");
  213 +
  214 + btn.prop('disable', true);
  215 + btn.prop('disabled', true);
  216 +
212 217 var formData = new FormData($(this)[0]),
213 218 file = $("#id_image")[0].files[0],
214 219 max_filesize = 5*1024*1024;
... ...
amadeus/static/js/mural.js
  Diff comments   View file @e46b949
... ... @@ -92,7 +92,7 @@ function setPostFormSubmit(post = "") {
92 92 var frm = $('#post-form');
93 93  
94 94 frm.submit(function (e) {
95   - var btn = frm.parent().parent().parent().find("button[form='post-form']")
  95 + var btn = frm.parent().parent().parent().find("button[form='post-form']");
96 96  
97 97 btn.prop('disable', true);
98 98 btn.prop('disabled', true);
... ...
amadeus/templates/base.html
  Diff comments   View file @e46b949
... ... @@ -248,45 +248,42 @@
248 248  
249 249 <div class="navbar-collapse collapse navbar-responsive-collapse">
250 250  
251   - <ul class="nav navbar-nav navbar-right notifications">
252   - <li>
  251 + <ul class="nav navbar-nav navbar-right notifications" style="margin-top: 50px;">
  252 + <li style="width: auto; text-align: center;">
253 253 <img src="{{ user.image_url }}" style="width:50px;height:50px; margin:10px;"/>
254 254 </li>
255   - <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
256   - <a href="" data-toggle="dropdown" class="dropdown-toggle profile" style="content:none;">
257   - <span class="visible-xs-inline">{{ user }}</span>
258   - </a>
259   - <ul class="dropdown-menu" role="menu">
260   - <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
261   - <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
262   - <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
263   - <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>
264   - </ul>
265   - </li>
  255 + <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
  256 + <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
  257 + <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
  258 + <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>
266 259  
267 260 {% if user.is_staff %}
268 261 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
269 262 <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
270 263 <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
271 264  
  265 + <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li>
  266 + <li><a href="{% url 'security:update' %}">{% trans 'Security' %}</a></li>
272 267 <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li>
  268 + <li><a href="{% url 'webconferences:settings' %}">{% trans 'Web Conference' %}</a></li>
273 269 {% endif %}
274 270 <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
275 271  
276   - <li style="width:40px;">
277   - <a href="{% url 'themes:contrast' %}" id="contrast_button">
  272 + <li>
  273 + <a href="{% url 'themes:contrast' %}" id="top_contrast_button" style="width:40px;">
278 274 <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i>
279 275 </a>
280 276 </li>
281 277 <li>
282 278 {% get_available_languages as LANGUAGES %}
283 279 {% get_language_info_list for LANGUAGES as languages %}
284   - {% for language in languages %}
285   - <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
286   - <a class="language-item" value-lang="{{language.code}}">
287   - <span>{{language.code}}</span>
288   - </a>
289   - </li>
  280 +
  281 + {% for language in languages %}
  282 + <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
  283 + <a class="language-item" value-lang="{{language.code}}">
  284 + <span>{{language.code}}</span>
  285 + </a>
  286 + </li>
290 287 {% endfor %}
291 288 </li>
292 289  
... ... @@ -308,6 +305,20 @@
308 305  
309 306 });
310 307 </script>
  308 +
  309 + <script type="text/javascript">
  310 + $("#top_contrast_button" ).click(function() {
  311 + if (Cookies.get('contrast_check')) {
  312 + Cookies.remove('contrast_check')
  313 + //location.reload()
  314 + }
  315 + else {
  316 + Cookies.set('contrast_check','contrast')
  317 + //location.reload()
  318 + }
  319 +
  320 + });
  321 + </script>
311 322 {% endblock %}
312 323  
313 324 <div class="container-fluid">
... ...