fix logo and home styles

diff --git a/README.rst b/README.rst
index e80c50d861c2c42ffc494bbfb6f04c21f5600bc2..56b41987e7f3cd8f523cefda82514efaa7ff6e17 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
 ===============================================
-Telemeta: open web audio app with semantics
+Telemeta: open web audio platform with semantics
 ===============================================
 
 |version| |downloads| |travis_master| |coverage_master|

diff --git a/telemeta/static/telemeta/css/telemeta.css b/telemeta/static/telemeta/css/telemeta.css
index 4f70aa628f0c371f95c1bbb063e5e04e615459c8..655cffa3efbe4b407d699ab11a534f5743cadf2d 100644 (file)
--- a/telemeta/static/telemeta/css/telemeta.css
+++ b/telemeta/static/telemeta/css/telemeta.css
@@ -51,13 +51,14 @@ svg {
 }
 
 .rst-content h1 {
-    font-size: 1.2em;
+    font-size: 1.3em;
     font-weight: bold;
     color: #353535;
+    margin-bottom: 1em;
 }
 
 .rst-content p {
-    font-size: 0.9em;
+    font-size: 1em;
     text-align: justify;
 }
 

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 7f518ae05f2f89f8d1233bd0a805220eba01be1a..e8ccb6d02f1be10b94c93a79334a080c6f1c73fd 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -52,7 +52,7 @@
 <div id="header">
 <div id="logo">
 {% block logo %}
-<a href="{% url "telemeta-home" %}"><img src="{{ STATIC_URL }}telemeta/images/logo_crem.png" alt="Telemeta" /></a>
+<a href="{% url "telemeta-home" %}"><img src="{{ STATIC_URL }}telemeta/images/logo_telemeta_2.png" alt="Telemeta" /></a>
 {% endblock %}
 </div>
 
@@ -66,9 +66,6 @@
 {% else %}
   {{ user.username }}
 {% endif %}
-{% if perms.telemeta.can_view_users_and_profiles %}
- | <a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a>
-{% endif %}
 <a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
 <a href="{% url "telemeta-logout" %}">{% trans "Sign out" %}
 <img src="{{ STATIC_URL }}telemeta/images/logout.png" alt="logout" style="vertical-align:middle" /></a>

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 0fd44ddca1cd6aeb058037893280221000d15045..0e4deeff4ee982b70002cbe369cc66b56d5816a8 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -294,7 +294,7 @@ def render_flatpage(content):
                 i = -1
             if i == 0:
                 line += reverse(urlname)
-            elif urlname[:1] != '/':
+            elif urlname[:1] != '/' and urlname[:4] != 'http':
                 line += reverse('telemeta-flatpage', args=[path + '/../' + urlname])
             else:
                 line += urlname
@@ -303,6 +303,7 @@ def render_flatpage(content):
 
     parts = publish_parts(source=smart_str(parsed), writer_name="html4css1", settings_overrides={})
     return mark_safe('<div class="rst-content">\n' + force_unicode(parts["html_body"]) + '</div>')
+
 render_flatpage.is_safe = True
 
 @register.simple_tag