completando el trabajo de @edvm con los titulos. Fix PyAr#132

samsagaz · Nov 19, 2014 · 1ea2096 · 1ea2096
1 parent 231cdf7
commit 1ea2096
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 45 deletions.
diff --git a/community/templates/base.html b/community/templates/base.html
@@ -5,7 +5,9 @@
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>{% block title %}{% endblock %} PyAr - Python Argentina</title>
+        <title>
+            {% block no_title %}{% block title %}{% endblock title %} - {% endblock no_title %} PyAr - Python Argentina
+        </title>
         <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
         <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css">
         <link rel="stylesheet" href="{% static "css/animate.css" %}">

diff --git a/community/templates/community/index.html b/community/templates/community/index.html
@@ -1,9 +1,7 @@
 {% extends "base_site.html" %}
 {% load devtags %}
 
-{% block title %}
-Bienvenido a 
-{% endblock %}
+{% block no_title %}{% endblock %}
 
 {% block beforemain %}
 <div class="banner-wrapper">

diff --git a/templates/companies/company_list.html b/templates/companies/company_list.html
@@ -3,9 +3,7 @@
 {% load i18n %}
 
 {% load devtags %}
-{% block title %}
-  Companias que utilizan Python - 
-{% endblock %}
+{% block title %}Empresas {% endblock %}
 
 {% block content %}
 <main id="main" class="container" role="main">

diff --git a/templates/events/event_detail.html b/templates/events/event_detail.html
@@ -4,6 +4,11 @@
 
 {% load devtags %}
 
+{% block title %}
+    {{ event.name }}
+{% endblock title %}
+
+
 {% block stylesheets %}
   <link rel="stylesheet" href="/static/css/event_map.css">
 {% endblock %}
@@ -38,9 +43,9 @@ <h1>
 
             <blockquote>
               <footer>
-                {{ event.updated_at }} {% trans 'por' %} {{ event.owner}} 
+                {{ event.updated_at }} {% trans 'por' %} {{ event.owner}}
                 {% if event.owner == user %}
-                  <a href="{% url 'events:delete' event.id %}">{% trans 'Borrar' %}</a> | 
+                  <a href="{% url 'events:delete' event.id %}">{% trans 'Borrar' %}</a> |
                   <a href="{% url 'events:edit' event.id %}">{% trans 'Modificar' %}</a>
                 {% endif %}
               </footer>

diff --git a/templates/events/event_list.html b/templates/events/event_list.html
@@ -4,9 +4,7 @@
 
 {% load devtags %}
 
-{% block title %}
-Eventos de 
-{% endblock %}
+{% block title %}Eventos {% endblock %}
 
 {% block left-column %}
 
@@ -26,8 +24,8 @@ <h2>
       </h2>
     </div>
 
-      {% for event in eventos_proximos %} 
-          
+      {% for event in eventos_proximos %}
+
           <article class="list-group-item">
               <h4 class="list-group-item-heading">
                 <a href="{% url 'events:detail' event.id %}">
@@ -38,9 +36,9 @@ <h4 class="list-group-item-heading">
               <p class="list-group-item-text">{{ event.description|truncatewords:"20" }}</p>
               <blockquote>
                 <footer>
-                {{ event.updated_at }} {% trans 'por' %} {{ event.owner}} 
+                {{ event.updated_at }} {% trans 'por' %} {{ event.owner}}
                   {% if event.owner == user %}
-                  <a href="{% url 'events:delete' event.id %}">{% trans 'Borrar' %}</a> | 
+                  <a href="{% url 'events:delete' event.id %}">{% trans 'Borrar' %}</a> |
                   <a href="{% url 'events:edit' event.id %}">{% trans 'Modificar' %}</a>
                   {% endif %}
                 </footer>
@@ -60,8 +58,8 @@ <h2>
           </h2>
       </header>
 
-      {% for event in eventos_pasados %} 
-          
+      {% for event in eventos_pasados %}
+
           <article class="list-group-item">
               <h4 class="list-group-item-heading">
                 <a href="{% url 'events:detail' event.id %}">
@@ -72,9 +70,9 @@ <h4 class="list-group-item-heading">
               <p class="list-group-item-text">{{ event.description|truncatewords:"20" }}</p>
               <blockquote>
                 <footer>
-                {{ event.updated_at }} {% trans 'por' %} {{ event.owner}} 
+                {{ event.updated_at }} {% trans 'por' %} {{ event.owner}}
                   {% if event.owner == user %}
-                  <a href="{% url 'events:delete' event.id %}">{% trans 'Borrar' %}</a> | 
+                  <a href="{% url 'events:delete' event.id %}">{% trans 'Borrar' %}</a> |
                   <a href="{% url 'events:edit' event.id %}">{% trans 'Modificar' %}</a>
                   {% endif %}
                 </footer>

diff --git a/templates/faq/all.html b/templates/faq/all.html
@@ -1,11 +1,9 @@
 {% extends "base_site.html" %}
 
 
-{% block left-column %} 
+{% block left-column %}
 
-{% block title %}
-  Preguntas frecuentes de 
-{% endblock %}
+{% block title %}Preguntas frecuentes {% endblock %}
 
 
 {% regroup faqs by topic as topic_list %}

diff --git a/templates/irc/irc.html b/templates/irc/irc.html
@@ -2,12 +2,10 @@
 
 {% load devtags %}
 
-{% block title %}
-  Internet Relay Chat | IRC de 
-{% endblock %}
+{% block title %}Canal de chat IRC{% endblock %}
 
 {% block left-column %}
-            <iframe src="https://kiwiirc.com/client/irc.freenode.org/?nick=pyarense_i|?#pyar" style="margin-top:20px; border:0; width:100%; height:450px;"></iframe> 
+            <iframe src="https://kiwiirc.com/client/irc.freenode.org/?nick=pyarense_i|?#pyar" style="margin-top:20px; border:0; width:100%; height:450px;"></iframe>
             <h2>Archivo de IRC</h2>
             <p>El archivo del canal se encuentra disponible en <a href="http://irclogger.com/.pyar/">http://irclogger.com/.pyar/</a></p>
             <h2>Accediendo al canal desde tu cliente favorito</h2>

diff --git a/templates/jobs/job_list.html b/templates/jobs/job_list.html
@@ -1,9 +1,7 @@
 {% extends "base_site.html" %}
 {% load devtags %}
 {% load i18n staticfiles pagination_tags %}
-{% block title %}
-  Trabajos de Python publicados en 
-{% endblock %}
+{% block title %}Trabajos de Python {% endblock %}
 {% block left-column %}
 <!-- Últimas noticias -->
 <section>
@@ -33,7 +31,7 @@ <h4>
                 <p><a href="{{ object.get_absolute_url }}">{% trans 'Leer más...' %}</a></p>
             </article>
             {% endfor %}
-            
+
             {% paginate %}
         {% else %}
             <div class="col-md-12">

diff --git a/templates/news/newsarticle_detail.html b/templates/news/newsarticle_detail.html
@@ -3,6 +3,9 @@
 {% load i18n %}
 {% load email_obfuscator %}
 {% load devtags %}
+{% block title %}
+  {{ object.title }}
+{% endblock title %}
 
 {% block content %}
 <main id="main" class="container" role="main">

diff --git a/templates/news/newsarticle_list.html b/templates/news/newsarticle_list.html
@@ -1,9 +1,7 @@
 {% extends "base_site.html" %}
 {% load devtags i18n staticfiles pagination_tags %}
 
-{% block title %}
-  Noticias de 
-{% endblock %}
+{% block title %}Noticias {% endblock %}
 
 {% block left-column %}
 <!-- Últimas noticias -->
@@ -42,6 +40,6 @@ <h4>
 {% endblock %}
 
 {% block right-column %}
-  {{ block.super }} 
+  {{ block.super }}
   {% include "_tags_filtering_form.html" %}
 {% endblock %}
diff --git a/templates/planet/posts/list.html b/templates/planet/posts/list.html
@@ -1,9 +1,7 @@
 {% extends "base_site.html" %}
 {% load devtags i18n staticfiles pagination_tags planet_tags %}
 
-{% block title %}
-Planeta de 
-{% endblock %}
+{% block title %}Planeta {% endblock %}
 
 {% block left-column %}
 <!-- Últimas noticias -->

diff --git a/templates/projects/all.html b/templates/projects/all.html
@@ -1,9 +1,7 @@
 {% extends "base_site.html" %}
 {% load devtags %}
 
-{% block title %}
-  Proyectos de
-{% endblock %}
+{% block title %}Proyectos {% endblock %}
 
 {% block left-column %}
     <!-- Últimas noticias -->
@@ -15,7 +13,7 @@ <h2>Proyectos de la Comunidad
               {% endif %}
             </h2>
         </div>
-        {% for project in pyar_projects %} 
+        {% for project in pyar_projects %}
             <article class="board-list-item">
               <h4>
                 <a href="{{ project.url }}">
@@ -29,7 +27,7 @@ <h4>
               <div class="text-muted"><p></p></div>
             </article>
         {% endfor %}
-        {% for project in projects %} 
+        {% for project in projects %}
             <article class="board-list-item">
               <h4>
                 <a href="{% url 'projects_view' project.id %}">
@@ -43,7 +41,7 @@ <h4>
 	      <div class="text-muted">
 		<p>
 		  {% if project.owner == user %}
-                    <a href="{% url 'projects_delete' project.id %}">Borrar</a> | 
+                    <a href="{% url 'projects_delete' project.id %}">Borrar</a> |
                     <a href="{% url 'projects_update' project.id %}">Modificar</a>
                   {% endif %}
 		</p>

diff --git a/templates/special_page.html b/templates/special_page.html
@@ -1,5 +1,9 @@
 {% extends "base_site.html" %}
 {% load waliki_tags %}
+{% block title %}
+    {{ title }}
+{% endblock title %}
+
 
 {% block left-column %}
   {% if title %}

diff --git a/templates/waliki/detail.html b/templates/waliki/detail.html
@@ -2,6 +2,10 @@
 {% load i18n %}
 {% load waliki_tags %}
 
+{% block title %}
+    {% if page.title %}{{ page.title} - {% endif %} Wiki
+{% endblock title %}
+
 {% block container_wrapper %}
 <main id="main" class="container" role="main">
     <div class="col-lg-12">