Changeset 7987 for trunk/themes/default


Ignore:
Timestamp:
Dec 3, 2010, 8:00:49 AM (14 years ago)
Author:
rvelices
Message:

new template feature: combine_css

  • fully functional with file merging
  • takes care of url() in css and recursively merge all @import
  • migrated public templates only; need more code doc
Location:
trunk/themes/default
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/themes/default/local_head.tpl

    r6577 r7987  
    1 <!--[if lt IE 7]>
    2         <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie5-ie6.css">
    3 <![endif]-->
    4 <!--[if IE 7]>
    5         <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie7.css">
    6 <![endif]-->
    7 <link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}themes/default/print.css">
     1{if $load_css}
     2        <!--[if lt IE 7]>
     3                <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie5-ie6.css">
     4        <![endif]-->
     5        <!--[if IE 7]>
     6                <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie7.css">
     7        <![endif]-->
     8        {combine_css path="themes/default/print.css" order=-10}
     9{/if}

  • trunk/themes/default/print.css

    r7869 r7987  
     1@media print {
    12#menubar, .content .navigationBar, UL.categoryActions, .content .calendarViews, .calendarBar,
    23#imageToolBar, .navThumb, #addComment {
    … …  
    1314        margin: 0 !important;
    1415}
     16}

  • trunk/themes/default/template/header.tpl

    r7975 r7987  
    3131{if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
    3232
     33
     34{get_combined_css}
     35
    3336{foreach from=$themes item=theme}
    3437{if $theme.load_css}
    35 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/theme.css">
     38{combine_css path="themes/`$theme.id`/theme.css" order=-10}
    3639{/if}
    37 {if !empty($theme.local_head)}{include file=$theme.local_head}{/if}
     40{if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if}
    3841{/foreach}
     42
    3943
    4044{if isset($U_PREFETCH)          }<link rel="prefetch" href="{$U_PREFETCH}">{/if}
    4145
    4246{if not empty($page_refresh)    }<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if}
    43 {*
    44 <script type="text/javascript" src="{$ROOT_URL}themes/default/js/scripts.js"></script>
    45 *}
     47
     48{get_combined_scripts load='header'}
    4649<!--[if lt IE 7]>
    4750<script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script>
    4851<![endif]-->
    49 
    50 {get_combined_scripts load='header'}
    5152
    5253{if not empty($head_elements)}

  • trunk/themes/default/template/include/datepicker.inc.tpl

    r7975 r7987  
    1111{/if}
    1212
    13 {html_head}
    14 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/js/ui/theme/ui.datepicker.css">
    15 {/html_head}
     13{combine_css path="themes/default/js/ui/theme/ui.datepicker.css"}
    1614
    1715{footer_script}
Note: See TracChangeset for help on using the changeset viewer.