Changeset 623:c59da4d445e8


Ignore:
Timestamp:
12/06/12 13:52:55 (11 months ago)
Author:
Santiago Piccinini (SAn) <spiccinini@…>
Branch:
default
Message:

Fixed lessc error and refactores extra_head

Location:
cyclope
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • cyclope/apps/medialibrary/templates/medialibrary/media_player.html

    r621 r623  
    1 {% load i18n compress %} 
     1{% load i18n %} 
    22 
    3 {% block extra_head %} 
    4 {% compress js %} 
     3{% block extra_head_js %} 
     4{{ block.super }} 
    55<script type='text/javascript' src='/media/cyclope/jwplayer/swfobject.js'></script> 
    6 {% endcompress %} 
    76{% endblock %} 
    87 

  • cyclope/core/collections/templates/collections/category_slideshow.html

    r621 r623  
    33{% load i18n cyclope_utils fb_versions compress %} 
    44 
    5 {% block extra_head %} 
    6 {% compress js %} 
     5{% block extra_head_js %} 
    76<script type="text/javascript" src="{{ CYCLOPE_STATIC_URL }}js/jquery.jcarousel.min.js"></script> 
    87<script type="text/javascript"> 
    … …  
    3938  }); 
    4039</script> 
    41 {% endcompress %} 
    42 {% compress css %} 
     40{% endblock %} 
     41 
     42{% block extra_head %} 
     43{% compress css inline %} 
    4344<link rel="stylesheet" type="text/css" href="{{ CYCLOPE_THEME_MEDIA_URL }}css/jcarousel.css" /> 
    4445{% endcompress %} 

  • cyclope/templates/cyclope/inline_view.html

    r378 r623  
    11{# This template wraps a view when inserted inline in a region #} 
     2{% load compress %} 
    23{% block extra_head %}{{ block.super }}{% endblock %} 
     4{% compress js inline %}{% block extra_head_js %}{{ block.super }}{% endblock %}{% endcompress %} 
    35{% block content %}{{ block.super }}{% endblock %} 

  • cyclope/templates/cyclope/menu_menuitems_hierarchy.html

    r496 r623  
    11{% extends host_template %} 
    22 
    3 {% block content %} 
    4  
    53{% if expand_style != "DISABLED" %} 
     4{% block extra_head_js %} 
     5{{ block.super }} 
    66<script type="text/javascript"> 
    77 
    … …  
    5151}); 
    5252</script> 
     53{% endblock extra_head_js %} 
    5354{% endif %} 
    5455 
     56{% block content %} 
    5557<ul id="menu-{{ expand_style|lower }}-{{ menu_slug }}" class="cyclope_menu {{ expand_style|lower }}"> 
    5658    {{ menu_items|unordered_list }} 

  • cyclope/templates/cyclope/site_search_box.html

    r621 r623  
    11{% extends host_template %} 
    2 {% load i18n compress %} 
     2{% load i18n %} 
    33 
    4 {% block extra_head %} 
    5 {% compress js %} 
     4{% block extra_head_js %} 
    65{{ block.super }} 
    7     <script type="text/javascript"> 
    8     $(function() { 
    9         // clear input on focus 
    10         $('.cleardefault').focus(function() { 
    11             if( this.value == this.title ) { 
    12                this.value = ''; 
    13             } 
    14         }); 
    15  
    16         // if field is empty afterward, add text again 
    17         $('.cleardefault').blur(function() { 
    18             if(!this.value.length) { 
    19               this.value = this.title; 
    20             } 
    21         }); 
     6<script type="text/javascript"> 
     7$(function() { 
     8    // clear input on focus 
     9    $('.cleardefault').focus(function() { 
     10        if( this.value == this.title ) { 
     11           this.value = ''; 
     12        } 
    2213    }); 
    2314 
    24     </script> 
    25 {% endcompress %} 
     15    // if field is empty afterward, add text again 
     16    $('.cleardefault').blur(function() { 
     17        if(!this.value.length) { 
     18          this.value = this.title; 
     19        } 
     20    }); 
     21}); 
     22</script> 
    2623{% endblock %} 
    2724 

  • cyclope/templates/cyclope/themes/neutrona/base.html

    r621 r623  
    2828    <link href="/rss" title="RSS" type="application/rss+xml" rel="alternate" /> 
    2929 
    30     {% if not COMPRESS_ENABLED %} 
     30    {% if debug %} 
    3131    <link href="{{ CYCLOPE_THEME_MEDIA_URL }}css/cyclope.less" rel="stylesheet/less" type="text/css"/> 
    3232    <script type="text/javascript" src="{{ CYCLOPE_STATIC_URL }}js/less-1.3.0.min.js"></script> 
    … …  
    6363    }); 
    6464    </script> 
     65    {% block extra_head_js %}{% endblock %} 
    6566    {% endcompress %} 
    6667    {% block extra_head %}{% endblock %} 
     68 
     69 
    6770  </head> 
    6871 
Note: See TracChangeset for help on using the changeset viewer.