Changeset 628:90b6545a6a3e


Ignore:
Timestamp:
20/06/12 14:14:07 (11 months ago)
Author:
Santiago Piccinini (SAn) <piccinini.santiago@…>
Branch:
default
rebase_source:
c2ad8a5059a8b11ac2bea2b06270343fd01eeed4
Message:

Cleaned up article's templates

Location:
cyclope/apps/articles/templates/articles
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • cyclope/apps/articles/templates/articles/article_detail.html

    r492 r628  
    11{% extends host_template %} 
    22 
    3 {% comment%} 
    4 TODO(nicoechaniz): finish adaptation from smarty to django. add trans to text that should be translated 
    5 {% endcomment%} 
    6  
    7 {% load comments i18n fb_versions cyclope_utils dbgettext_tags%} 
     3{% load comments i18n fb_versions cyclope_utils dbgettext_tags %} 
    84 
    95{% block content %} 
    10  
    116{% alias article as 'current_object' %} 
    12  
    137<div class="content-view article detail article-detail"> 
    148 
    … …  
    1610  <h6 class="pretitle">{% trans article.pretitle %}</h6> 
    1711  {% endif %} 
     12 
    1813  <h1 class="title">{% trans article.name  %}</h1> 
    1914 
    … …  
    4237  {% endif %} 
    4338 
    44  
    4539  <!-- author --> 
    4640  {% if article.author %} 
    4741  <h4 class="author meta-content"> 
    48    {% comment %}the path author image not work. uncomment when fixed. 
    49     {% if article.author.image %} 
    50     <img src="{% version author.image.path 'small' %}" width="60" alt="{{ article.author }}" /> 
    51     {% endif %} 
    52     {% endcomment %} 
    5342    <span>{% trans "By"%} {{ article.author }}</span> 
    5443  </h4> 
    5544  {% endif %} 
    5645  <!-- /autor --> 
    57  
    58     <!-- descargas --> 
    59  
    60 <!-- TODO(nicoechaniz): uncomment and fix when attachments are implemented 
    61  
    62             {if $articulo.downloads eq 'si'} 
    63  
    64           <div id="attachments"> 
    65           <div class="attachments_box"> 
    66             <h6><img src="{$templatedir}{{ CYCLOPE_THEME_MEDIA_URL }}images/css/leer_adjuntos.png" alt="Adjuntos"  width="16" height="16" border="0" align="absmiddle" /> Archivos para descargar </h6> 
    67              {section name=bucle loop=$downloads} 
    68             <p><img src="http://codigosur.org/imagenes/icons/{$downloads[bucle].ext}.gif" width="20" height="22" border="0" align="middle"> <a href="{$downloads[bucle].link}" title="{$downloads[bucle].desc}" >{$downloads[bucle].nombre}</a></p> 
    69             {/section} 
    70            </div> 
    71           </div> 
    72  
    73           {/if} 
    74 --> 
    75           <!-- /descargas --> 
    7646 
    7747  <div class="text"><span class="html-text html-content"> 
    … …  
    8050 
    8151{% if article.get_last_change_date or article.source %} 
    82        {% if article.source %} 
    83     <h6 class="source"> 
    84        <!-- {% if article.get_last_change_date %}|{% endif%} --> 
    85       {% trans "Source" %}: {{article.source}} 
    86     </h6> 
     52    {% if article.source %} 
     53    <h6 class="source">{% trans "Source" %}: {{article.source}}</h6> 
    8754    {% endif %} 
    88      
     55 
    8956    {% if article.get_last_change_date %} 
    9057    <span class="date"> 
    … …  
    9259    </span> 
    9360    {% endif %} 
    94  
    95   
    9661{% endif %} 
    97  
    98 {% comment %} {# TAGS ARE NOT IMPLEMENTED YET #} 
    99   {% if article.tags %} 
    100     <div class="meta-content"><span class="tags"><span class="tags-label"> {% trans "Tags" %}:</span>{{ article.tags }}</span></div> 
    101   {% endif %} 
    102 {% endcomment %} 
    10362 
    10463<div class="meta-content">{% include 'collections/categories_navigation_block.html' %}</div> 
    10564 
     65{% include 'cyclope/related_contents_block.html' %} 
    10666 
    107   {% include 'cyclope/related_contents_block.html' %} 
    108  
    109  
    110               <div class="clear"></div> 
    111      <!-- redsocial #TODO: commented until fixed 
    112            <div id="socialnetworks" class="socialnetworks">{% trans "Share in your social networks"%}: 
    113 <a href="http://www.facebook.com" rel="nofollow" onclick="sbs_facebook(); return false;"><img src="{{ CYCLOPE_THEME_MEDIA_URL }}images/redsocial/facebook.png" border="0" alt="Compartir en Facebook" title="Compartir en Facebook" height="24" width="24" /></a> 
    114 <a href="http://www.del.icio.us" rel="nofollow" onclick="sbs_delicious(); return false;"><img src="{{ CYCLOPE_THEME_MEDIA_URL }}images/redsocial/delicious.png" border="0" alt="Compartir en Delicious" title="Compartir en Delicious" height="24" width="24" /></a> 
    115 <a href="http://www.yahoo.com" rel="nofollow" onclick="sbs_yahoobm(); return false;"><img src="{{ CYCLOPE_THEME_MEDIA_URL }}images/redsocial/yahoo.png" border="0" alt="Compartir en Yahoo" title="Compartir en Yahoo" height="24" width="24" /></a> 
    116 <a href="http://www.google.com" rel="nofollow" onclick="sbs_googlebm(); return false;"><img src="{{ CYCLOPE_THEME_MEDIA_URL }}images/redsocial/google.png" border="0" alt="Compartir en Google" title="Compartir en Google" height="24" width="24" /></a> 
    117         </div> 
    118  
    119             <div class="clear"></div> 
    120           /redsocial --> 
    121  
    122  
     67<div class="clear"></div> 
    12368 
    12469<!--COMENTARIOS --> 
    12570  {% include 'comments/comments_block.html' %} 
    126  
    12771</div> <!--termina article_detail --> 
    128  
    12972{% endblock content%} 

  • cyclope/apps/articles/templates/articles/article_slideshow_item.html

    r601 r628  
    11{% load i18n fb_versions cyclope_utils dbgettext_tags %} 
    22  <div class="slideshow article teaser"> 
    3  
    43    {% if view_options.show_image %} 
    54    <div class="teaser_icon_container"> 
    … …  
    3231      </div> 
    3332    {% endif %} 
    34   

  • cyclope/apps/articles/templates/articles/article_teaser.html

    r492 r628  
    55    <div class="pretitle-container first meta-content"> 
    66      {% if  article.pretitle and not simplified_view %} 
    7       <div class="pretitle">{% trans article.pretitle %}{% if article.date %}<span class="pretitle-separator"> | </span>{% endif %}</div> 
     7      <div class="pretitle">{% trans article.pretitle %} 
     8        {% if article.date %}<span class="pretitle-separator"> | </span>{% endif %}</div> 
    89      {% endif%} 
    9        
     10 
    1011      {% if article.date %} 
    1112      <div class="date">{{ article.date|date:'SHORT_DATE_FORMAT' }}</div> 
    … …  
    1314    </div> 
    1415 
    15     <h2 class="title"><img class="type_icon" src="{{ CYCLOPE_THEME_MEDIA_URL }}images/icons/article.png" /><a href="{% url article-detail article.slug %}">{{ article.name }}</a></h2> 
     16    <h2 class="title"><img class="type_icon" src="{{ CYCLOPE_THEME_MEDIA_URL }}images/icons/article.png" /> 
     17      <a href="{% url article-detail article.slug %}">{{ article.name }}</a> 
     18    </h2> 
    1619 
    1720    {% if article.pictures and not simplified_view %} 
    … …  
    2730        {{ article|parsed_gettext:"text"|smart_style|truncatewords_html:40 }} 
    2831      {% endif %} 
    29       <span class="more"><a href="{% url article-detail article.slug %}"> {% trans "More" %}</a></span>  
     32      <span class="more"><a href="{% url article-detail article.slug %}"> {% trans "More" %}</a></span> 
    3033    </div> 
    3134 
    … …  
    4245    {% if not simplified_view %} 
    4346 
    44 {% comment %} TAGS ARE NOT IMPLEMENTED 
    45         {% if article.tags %} 
    46         <div class="meta-content"><h2 class="tags"> 
    47           <span class="tags-label">{% trans "Tags" %}:</span> 
    48           {% tags_for_object article as article_tags %} 
    49           {% for tag in article_tags %} 
    50             <!--<a href="/tag/{{ tag.name|slugify }}" class="tag">{{tag.name}}</a>--> 
    51             {{tag.name}}{% if not forloop.last%},{% endif%} 
    52  
    53           {% endfor %} 
    54         </h2></div> 
    55         {% endif %} 
    56 {% endcomment %} 
    5747    <div class="clear"></div> 
    5848    {% endif %} 
    59  
    6049  </div> 
Note: See TracChangeset for help on using the changeset viewer.