fix action buttons

diff --git a/example/settings.py b/example/settings.py
index 90975a296e7f58fd711e2fc74a4528588fd2b0e2..d580b2da8d4fd48a3d04f886836592389c3fbc2a 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -95,12 +95,12 @@ STATICFILES_FINDERS = (
 SECRET_KEY = 'a8l7%06wr2k+3=%#*#@#rvop2mmzko)44%7k(zx%lls^ihm9^5'
 
 # List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    ('django.template.loaders.cached.Loader', (
-        'django.template.loaders.filesystem.Loader',
-        'django.template.loaders.app_directories.Loader',
-    )),
-)
+#TEMPLATE_LOADERS = (
+#    ('django.template.loaders.cached.Loader', (
+#        'django.template.loaders.filesystem.Loader',
+#        'django.template.loaders.app_directories.Loader',
+#    )),
+#)
 
 
 MIDDLEWARE_CLASSES = (

diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css
index cbf6a6d6cdefb7c8fde05d3d3e41237d208e4671..ef2ab12467e9fe5a659e253e721c4fd498e49a16 100644 (file)
--- a/teleforma/htdocs/css/teleforma.css
+++ b/teleforma/htdocs/css/teleforma.css
@@ -927,7 +927,7 @@ img.align-left {
     border: 1px solid #000;
     background-image: url(../images/grid_bg_2.png);
     padding: 0.3em 0.4em 0.4em 0.4em;
-    margin: 2.5em 1em 1em 0em;
+    margin: 2em 1em 0em 0em;
     -moz-border-radius: 8px 0px 8px 8px;
     -webkit-border-radius: 8px 0px 8px 8px;
     border-radius: 8px 0px 8px 8px;
@@ -1152,9 +1152,14 @@ a.image-link {
     padding:0.8em 0.8em 0.8em 0.8em;
     }
 
+#action_violet {
+    background-color: #a00020;
+    color: #FFF;
+    padding:0.8em 0.8em 0.8em 0.8em;
+    }
 
 #action_red {
-    background-color:  #d24836;
+    background-color:  #db1020;
     color: #FFF;
     padding:0.8em 0.8em 0.8em 0.8em;
     }

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 0ace9ff31b9bedd2587299976e359e2707c658e8..73d26e4e0879085f5e463f74c094003e0a4a1876 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -61,16 +61,16 @@ $(document).ready(function(){
 {% block chat %}
 {% if room %}
 
-<div id="module-set" style="width: 270px">
+<div id="module-set" style="width: 290px">
 
 <div class="module">
-<h3><img src="{% url telemeta-images "search_wh2.png" %}" alt="rss" style="vertical-align:middle" />{% trans "Questions" %}</h3>
+<h3><img src="{% url telemeta-images "search_wh2.png" %}" alt="rss" style="vertical-align:middle" />{% trans "Chatter" %}</h3>
 <div style="background: white;">
 <div id="chatwindow"><span id="loading">Loading...</span></div>
 <form id="chatform">{% csrf_token %}
 <label for="msg"></label>
 <input type="text" id="msg" />
-<input type="submit" value="Ask" />
+<input type="submit" value="{% trans "Send" %}" />
 </form>
 <!--<script type="text/javascript">document.getElementById("msg").focus();</script>-->
 </div>

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 1539663eb73571db9ff0b516fb73d80da60d18cc..3ca3bcdff0d89465c3c8333c17cecf308827378b 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -34,7 +34,7 @@
 </div>
 </div>
 <div class="module_action">
-<a href="#" class="component_icon button" id="action_blue">{% trans "New note" %}</a>
+<a href="#" class="component_icon button" id="action_violet">{% trans "New note" %}</a>
 </div>
 {% endblock notes %}
 

diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html
index 90dba8a94c9395b87dbbe849636edabf53a9e17a..9f3aa6e86f2331abdd01f4733f33f85bf1973e5b 100644 (file)
--- a/teleforma/templates/telemeta/profile_detail.html
+++ b/teleforma/templates/telemeta/profile_detail.html
@@ -21,7 +21,7 @@
 
   {% if user.is_authenticated and user.username == usr.username or user.is_staff %}
    <div class="module_action">
-    <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button" id="action_blue">{% trans "Edit" %}</a>
+    <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button" id="action_blue">{% trans "Modify" %}</a>
    </div>
   {%  endif %}
 

diff --git a/teleforma/templates/telemeta/search_criteria.html b/teleforma/templates/telemeta/search_criteria.html
index d5606311177420ce0b635876123ac1e07a5b7702..dc1aa93baf75061cc8893d442e84c3bf3b6c1add 100644 (file)
--- a/teleforma/templates/telemeta/search_criteria.html
+++ b/teleforma/templates/telemeta/search_criteria.html
@@ -64,10 +64,6 @@ $(document).ready(function () {
     {% endwith %}
     {% endblock %}
 
-    <div class="module_action">
-    <a href="#" class="component_icon button" id="action_yellow"
-      onclick="document.getElementById('searchform').submit(); return false;">{% trans 'Search' %}</a>
-    </div>
 </div>
 
 <div class="desk_course">
@@ -151,6 +147,14 @@ $(document).ready(function () {
 </fieldset>
 
 </form>
+
 </div>
 </div>
+
+<div class="module_action">
+    <a href="#" class="component_icon button" id="action_yellow"
+      onclick="document.getElementById('searchform').submit(); return false;">{% trans 'Search' %}</a>
+</div>
+
+
 {% endblock %}