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

Jose Guilherme
2 parents 6beb1813 334f579e
Showing 5 changed files with 51 additions and 28 deletions Show diff stats
amadeus/static/css/base/amadeus_responsive.css
amadeus/static/css/themes/contrast.css
amadeus/static/js/chat.js
amadeus/static/js/mural.js
amadeus/templates/base.html
@@ -122,7 +122,12 @@
 	}
 	.navbar-header{
-		width: 100% !important;
+		width: 100%;
+		position: fixed;
+	    top: 0px;
+	    z-index: 999;
+	    height: 50px;
+	    background: #009C8A;
 	}
 	.navbar .navbar-brand{
@@ -298,13 +303,11 @@
 		padding:10px;
 	}
-	.btn{
-		padding: 0px 10px;
-    	margin: 10px 1px;
-	}
 	#btn-search {
 		font-size: 1.5em;
+		padding: 0px 10px;
+    	margin: 10px 1px;
 	}
 	.navbar .logo{
 		margin: auto;
@@ -305,6 +305,10 @@ fieldset[disabled][disabled] .input-group-btn .btn {
   background: #FFF333 !important;
   color: #000000 !important; }
+.navbar-header{
+  background: #FFF333 !important;
+  color: #000000 !important; }
+}
 .navbar-nav li.settings_menu_active {
   background: #FFF333; }
@@ -208,7 +208,12 @@ function setChatFormSubmit() {
     var frm = $('#chat-form'),
         error_msg = frm.data('error');
-    frm.submit(function () {
+    frm.submit(function (e) {
+        var btn = frm.parent().parent().find("button[form='chat-form']");
+
+        btn.prop('disable', true);
+        btn.prop('disabled', true);
+
         var formData = new FormData($(this)[0]),
             file = $("#id_image")[0].files[0],
             max_filesize = 5*1024*1024;
@@ -92,7 +92,7 @@ function setPostFormSubmit(post = &quot;&quot;) {
     var frm = $('#post-form');
     frm.submit(function (e) {
-        var btn = frm.parent().parent().parent().find("button[form='post-form']")
+        var btn = frm.parent().parent().parent().find("button[form='post-form']");
         btn.prop('disable', true);
         btn.prop('disabled', true);
@@ -248,45 +248,42 @@
             <div class="navbar-collapse collapse navbar-responsive-collapse">
-                <ul class="nav navbar-nav navbar-right notifications">
-                    <li>
+                <ul class="nav navbar-nav navbar-right notifications" style="margin-top: 50px;">
+                    <li style="width: auto; text-align: center;">
                         <img src="{{ user.image_url }}" style="width:50px;height:50px; margin:10px;"/>
                     </li>
-                    <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
-                        <a href="" data-toggle="dropdown" class="dropdown-toggle profile" style="content:none;">
-                            <span class="visible-xs-inline">{{ user }}</span>
-                        </a>
-                        <ul class="dropdown-menu" role="menu">
-                            <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                            <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
-                            <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
-                            <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>
-                        </ul>
-                    </li>
+                    <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+                    <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
+                    <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
+                    <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>
                     {% if user.is_staff %}
                         <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
                         <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
                         <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
+                        <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li>
+                        <li><a href="{% url 'security:update' %}">{% trans 'Security' %}</a></li>
                         <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li>
+                        <li><a href="{% url 'webconferences:settings' %}">{% trans 'Web Conference' %}</a></li>
                     {% endif %}
                     <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
-                    <li style="width:40px;">
-                        <a href="{% url 'themes:contrast' %}" id="contrast_button">
+                    <li>
+                        <a href="{% url 'themes:contrast' %}" id="top_contrast_button" style="width:40px;">
                             <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i>
                         </a>
                     </li>
                     <li>
                         {% get_available_languages as LANGUAGES %}
                         {% get_language_info_list for LANGUAGES as languages %}
-                        {% for language in languages %}
-                            <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
-                                <a class="language-item" value-lang="{{language.code}}">
-                                    <span>{{language.code}}</span>
-                                </a>
-                            </li>
+                        
+                            {% for language in languages %}
+                                <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
+                                    <a class="language-item" value-lang="{{language.code}}">
+                                        <span>{{language.code}}</span>
+                                    </a>
+                                </li>
                         {% endfor %}
                     </li>
@@ -308,6 +305,20 @@
 		    });
 		</script>
+
+        <script type="text/javascript">
+            $("#top_contrast_button" ).click(function() {
+              if (Cookies.get('contrast_check')) {
+                Cookies.remove('contrast_check')
+                //location.reload()
+              }
+              else {
+                Cookies.set('contrast_check','contrast')
+                //location.reload()
+              }
+
+            });
+        </script>
     {% endblock %}
     <div class="container-fluid">
	@@ -92,7 +92,7 @@ function setPostFormSubmit(post = "") {		@@ -92,7 +92,7 @@ function setPostFormSubmit(post = "") {
92	var frm = $('#post-form');	92	var frm = $('#post-form');
93		93
94	frm.submit(function (e) {	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	btn.prop('disable', true);	97	btn.prop('disable', true);
98	btn.prop('disabled', true);	98	btn.prop('disabled', true);