Changeset 621:72a006c32a64


Ignore:
Timestamp:
11/06/12 21:20:54 (11 months ago)
Author:
Santiago Piccinini (SAn) <spiccinini@…>
Branch:
default
Message:

Added django-compressor

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • cyclope/apps/contacts/templates/contacts/contact_detail.html

    r493 r621  
    22 
    33{% load comments i18n fb_versions cyclope_utils markup dbgettext_tags%} 
    4  
    5 {% block extra_head %} 
    6 <style media="screen, print" type="text/css"> 
    7 </style> 
    8 {% endblock extra_head %} 
    94 
    105{% block content %} 
    … …  
    2520  </div> 
    2621  <!-- /herramientas --> 
    27    
    28    
     22 
     23 
    2924  {% if contact.photo %} 
    3025  <img class="contact_photo" src="{% version contact.photo 'cropped' %}" /> 

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

    r494 r621  
    1 {% load i18n %} 
     1{% load i18n compress %} 
    22 
    33{% block extra_head %} 
     4{% compress js %} 
    45<script type='text/javascript' src='/media/cyclope/jwplayer/swfobject.js'></script> 
     6{% endcompress %} 
    57{% endblock %} 
    68 

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

    r524 r621  
    11{% extends host_template %} 
    22 
    3 {% load i18n cyclope_utils fb_versions %} 
     3{% load i18n cyclope_utils fb_versions compress %} 
    44 
    55{% block extra_head %} 
     6{% compress js %} 
    67<script type="text/javascript" src="{{ CYCLOPE_STATIC_URL }}js/jquery.jcarousel.min.js"></script> 
    78<script type="text/javascript"> 
    … …  
    3839  }); 
    3940</script> 
     41{% endcompress %} 
     42{% compress css %} 
    4043<link rel="stylesheet" type="text/css" href="{{ CYCLOPE_THEME_MEDIA_URL }}css/jcarousel.css" /> 
     44{% endcompress %} 
    4145{% endblock %} 
    4246 

  • cyclope/core/context_processors.py

    r277 r621  
    2020# along with this program.  If not, see <http://www.gnu.org/licenses/>. 
    2121 
     22from django.conf import settings 
    2223from cyclope import settings as cyc_settings 
    2324 
    … …  
    3031            settings_dict[setting] = getattr(cyc_settings, setting) 
    3132    return settings_dict 
     33 
     34 
     35def third_party_settings(request): 
     36    """Exposes some necesary settings of third party apps to the template. 
     37    """ 
     38    settings_dict = {} 
     39 
     40    settings_dict["COMPRESS_ENABLED"] = getattr(settings, "COMPRESS_ENABLED", False) 
     41    return settings_dict 

  • cyclope/default_settings.py

    r570 r621  
    6262    "django.core.context_processors.request", 
    6363    "cyclope.core.context_processors.site_settings", 
     64    "cyclope.core.context_processors.third_party_settings", 
    6465) 
    6566 
    … …  
    126127    'contact_form', 
    127128    'markitup', 
     129    'compressor', 
    128130 
    129131#    'debug_toolbar', 
    … …  
    250252MARKITUP_FILTER = ('django.contrib.markup.templatetags.markup.textile', {}) 
    251253 
    252  
     254# compressor settings 
     255COMPRESS_PARSER = "compressor.parser.HtmlParser" 
     256 
     257COMPRESS_PRECOMPILERS = ( 
     258    ('text/less', '/usr/bin/lessc {infile} {outfile}'), 
     259) 

  • cyclope/templates/comments/comments_list.html

    r527 r621  
    11{% extends host_template %} 
    22{% load i18n %} 
    3  
    4 {% block extra_head %} 
    5 {% endblock %} 
    63 
    74{% block content %} 

  • cyclope/templates/cyclope/site_search_box.html

    r402 r621  
    11{% extends host_template %} 
    2 {% load i18n %} 
     2{% load i18n compress %} 
    33 
    44{% block extra_head %} 
     5{% compress js %} 
    56{{ block.super }} 
    67    <script type="text/javascript"> 
    … …  
    2223 
    2324    </script> 
     25{% endcompress %} 
    2426{% endblock %} 
    2527 

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

    r612 r621  
    1717 --> 
    1818 
    19 {% load layout i18n tagging_tags %} 
    20    
     19{% load layout i18n tagging_tags compress %} 
     20 
    2121<html> 
    22   
     22 
    2323 <head> 
    2424    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
    … …  
    2828    <link href="/rss" title="RSS" type="application/rss+xml" rel="alternate" /> 
    2929 
     30    {% if not COMPRESS_ENABLED %} 
    3031    <link href="{{ CYCLOPE_THEME_MEDIA_URL }}css/cyclope.less" rel="stylesheet/less" type="text/css"/> 
    31     <link href="{{ CYCLOPE_THEME_MEDIA_URL }}css/print.css" rel="stylesheet" type="text/css" media="print"/>     
     32    <script type="text/javascript" src="{{ CYCLOPE_STATIC_URL }}js/less-1.3.0.min.js"></script> 
     33    {% else %} 
     34    {% compress css %} 
     35    <link href="{{ CYCLOPE_THEME_MEDIA_URL }}css/cyclope.less" rel="stylesheet" type="text/less"/> 
     36    {% endcompress %} 
     37    {% endif %} 
     38    {% compress css %} 
     39    <link href="{{ CYCLOPE_THEME_MEDIA_URL }}css/print.css" rel="stylesheet" type="text/css" media="print"/> 
    3240    <link href="{{ CYCLOPE_STATIC_URL }}js/lightbox/css/jquery.lightbox-0.5.css" rel="stylesheet" type="text/css" media="screen"/> 
    33     <script type="text/javascript" src="{{ CYCLOPE_STATIC_URL }}js/less-1.3.0.min.js"></script>     
     41    {% endcompress %} 
     42    {% compress js %} 
    3443    <script type="text/javascript" src="{{ CYCLOPE_STATIC_URL }}js/jquery-1.5.1.min.js"></script> 
    3544    <script type="text/javascript" src="{{ CYCLOPE_STATIC_URL }}js/jquery-ui-1.8.13.custom.min.js"></script> 
    … …  
    5059            containerResizeSpeed:   400, 
    5160            txtImage:               '{% trans "Image"%}', 
    52             txtOf:                  '{% trans "of"%}', 
     61            txtOf:                  '{% trans "of"%}' 
    5362        }); 
    5463    }); 
    5564    </script> 
     65    {% endcompress %} 
    5666    {% block extra_head %}{% endblock %} 
    5767  </head> 
    … …  
    115125        </div> 
    116126      <!-- /pie --> 
    117       
     127 
    118128    </div> 
    119129    <!-- /mascara --> 

  • setup.py

    r537 r621  
    7878        'django-jsonfield==0.6.0-cyclope', # installed from our clone 
    7979        'feedparser==5.1', 
     80        'django-compressor==1.1.2', 
    8081    ], 
    8182 
Note: See TracChangeset for help on using the changeset viewer.