]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0fb7ecc)
add mobile meta views ! Woaaa :)
authoryomguy <yomguy@parisson.com>
Fri, 13 Apr 2012 10:51:23 +0000 (12:51 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 13 Apr 2012 10:51:23 +0000 (12:51 +0200)
teleforma/htdocs/css/teleforma.css patch | blob | history
teleforma/templates/postman/base_folder.html patch | blob | history
teleforma/templates/postman/base_write.html patch | blob | history
teleforma/templates/postman/view.html patch | blob | history
teleforma/templates/teleforma/course_media.html patch | blob | history
teleforma/templates/telemeta/base.html patch | blob | history

diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css
index 29bc1f0a327b838d8d728818264ca46d39dc40ba..627b96c8f4c7b3f164e6a9c3b155dbf15aeb56b8 100644 (file)
--- a/teleforma/htdocs/css/teleforma.css
+++ b/teleforma/htdocs/css/teleforma.css
@@ -939,8 +939,8 @@ img.align-left {
     color: #FFF;
     font-size: 1.1em;
     font-weight: bold;
-    -webkit-margin-before: 0.2em;
-    -webkit-margin-after: 0.2em;
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
 }
 
 #module-set .module a:hover {
@@ -1382,6 +1382,13 @@ input,textarea{
     padding: 0em 1.8em 0em 1em;
     }
 
+
+.desk_messages {
+    float: left;
+    width:75%;
+    padding: 0em 0em 0em 1em;
+    }
+
 .desk_course {
     float: left;
     width:52%;
diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html
index 2f57032cd8c9ef438b8e3dfaa0c1148a2a92a0e1..38dc8c8a6522c3ce91ef44c413a7702d9ed0f26e 100644 (file)
--- a/teleforma/templates/postman/base_folder.html
+++ b/teleforma/templates/postman/base_folder.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 
-<div id="postman" class="desk_large">
+<div id="postman" class="desk_messages">
 
 {% block pm_by_modes %}
 <div id="pm_by_modes" style="float: right;">
diff --git a/teleforma/templates/postman/base_write.html b/teleforma/templates/postman/base_write.html
index f7b7d86187c7b4d299ac797e7ff4327dae51b6c8..80982c15f12e056284d26d82802b015f1d6d7340 100644 (file)
--- a/teleforma/templates/postman/base_write.html
+++ b/teleforma/templates/postman/base_write.html
@@ -10,7 +10,7 @@
 {% endif %}
 {% endblock %}
 {% block content %}
-<div id="postman" class="desk_course">
+<div id="postman" class="desk_messages">
 <h1>{% block pm_write_title %}{% endblock %}</h1>
 <form id="_messageForm" action="{% if next_url %}?next={{ next_url|urlencode }}{% endif %}" method="post">{% csrf_token %}
 <table>
diff --git a/teleforma/templates/postman/view.html b/teleforma/templates/postman/view.html
index b6525e11162aa08ae247d2621cbaebf3fa84d9b5..f68e7a615b96fab7cab76eb19ac260bef2e650cd 100644 (file)
--- a/teleforma/templates/postman/view.html
+++ b/teleforma/templates/postman/view.html
@@ -4,7 +4,7 @@
 {% load postman_tags %}
 
 {% block content %}
-<div id="postman" class="desk_large">
+<div id="postman" class="desk_messages">
 
 <h1>{% if pm_messages|length > 1 %}{% trans "Conversation" %}{% else %}{% trans "Message" %}{% endif %}</h1>
 <br /><br />
diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 105d6b5891020c890c615a1dc31534dfff206f9d..530a2d9aff2534c93ce9c0e98f94095554586ffd 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -22,7 +22,7 @@ $(document).ready(function(){
 {% block course %}
 <div class="course_media">
 
-<div class="course_title">{{ course.title }}{% if course.description %} - {{ course.description }}{% endif %}
+<div class="course_title">{{ course.title }}{% if course.description %} - {{ course.description }}{% endif %}{% if media.item %} - {{ media.item }}{% endif %}
 </div>
 
 <div class="media">
diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 5b83955e769246d2b9c064cc020a4e178adb4f9b..9f391547cef8d875b81bb85ca7b33f2b48ddc63d 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -1,13 +1,16 @@
 <!DOCTYPE html>
 {% load i18n %}
 {% load telemeta_utils %}
-
 {% get_current_language as LANGUAGE_CODE %}
 {% get_available_languages as LANGUAGES %}
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 
 <head>
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=1;" />
+<meta name="apple-mobile-web-app-capable" content="yes" />
+<meta names="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+
 <title>{%block head_title %}{% description %} - Telemeta{% endblock %}</title>
 
 {% block stylesheets %}
@@ -35,6 +38,9 @@
 {% else %}
 <script type='text/javascript'>var CURRENT_USER_NAME=undefined;</script>
 {% endif %}
+
+<script type='text/javascript'>window.scrollTo(0, 1);</script>
+
 {% endblock %}
 
 {% block extra_javascript %}{% endblock %}
Unnamed repository; edit this file 'description' to name the repository.