Changeset 29389


Ignore:
Timestamp:
Sep 3, 2014, 11:02:07 AM (10 years ago)
Author:
plg
Message:

feature 3133: add colorscheme parameter for themes. This way we can use the
appropriate CSS for selectize (and other things)

Location:
trunk
Files:
14 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/admin/themes/clear/themeconf.inc.php

    r5177 r29389  
    44  'parent'   => 'default',
    55  'admin_icon_dir' => 'admin/themes/clear/icon',
     6  'colorscheme' => 'clear',
    67);
    78?>

  • trunk/admin/themes/default/template/batch_manager_global.tpl

    r29249 r29389  
    1111{combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'}
    1212
    13 {assign var="selectizeTheme" value=($themeconf.name=='roma')|ternary:'dark':'default'}
    1413{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    15 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.`$selectizeTheme`.css"}
     14{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    1615
    1716{combine_script id='jquery.progressBar' load='async' path='themes/default/js/plugins/jquery.progressbar.min.js'}

  • trunk/admin/themes/default/template/batch_manager_unit.tpl

    r29349 r29389  
    55{combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'}
    66
    7 {assign var="selectizeTheme" value=($themeconf.name=='roma')|ternary:'dark':'default'}
    87{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    9 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.`$selectizeTheme`.css"}
     8{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    109
    1110{footer_script}

  • trunk/admin/themes/default/template/cat_modify.tpl

    r29265 r29389  
    11{combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'}
    22
    3 {assign var="selectizeTheme" value=($themeconf.name=='roma')|ternary:'dark':'default'}
    43{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    5 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.`$selectizeTheme`.css"}
     4{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    65
    76{footer_script}

  • trunk/admin/themes/default/template/cat_perm.tpl

    r28703 r29389  
    11{combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'}
    22
    3 {assign var="selectizeTheme" value=($themeconf.name=='roma')|ternary:'dark':'default'}
    43{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    5 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.`$selectizeTheme`.css"}
     4{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    65
    76{footer_script}

  • trunk/admin/themes/default/template/include/add_album.inc.tpl

    r28806 r29389  
    22{include file='include/colorbox.inc.tpl' load_mode=$load_mode}
    33
    4 {assign var="selectizeTheme" value=($themeconf.name=='roma')|ternary:'dark':'default'}
    54{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    6 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.`$selectizeTheme`.css"}
     5{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    76
    87{combine_script id='addAlbum' load=$load_mode path='admin/themes/default/js/addAlbum.js'}

  • trunk/admin/themes/default/template/photos_add_direct.tpl

    r29356 r29389  
    1818{combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'}
    1919
    20 {assign var="selectizeTheme" value=($themeconf.name=='roma')|ternary:'dark':'default'}
    2120{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    22 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.`$selectizeTheme`.css"}
     21{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    2322
    2423{footer_script}

  • trunk/admin/themes/default/template/picture_modify.tpl

    r28991 r29389  
    44{combine_script id='LocalStorageCache' load='footer' path='admin/themes/default/js/LocalStorageCache.js'}
    55
    6 {assign var="selectizeTheme" value=($themeconf.name=='roma')|ternary:'dark':'default'}
    76{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    8 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.`$selectizeTheme`.css"}
     7{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    98
    109{footer_script}

  • trunk/admin/themes/default/template/user_list.tpl

    r29074 r29389  
    44{combine_css path="themes/default/js/plugins/datatables/css/jquery.dataTables.css"}
    55
    6 {assign var="selectizeTheme" value=($themeconf.name=='roma')|ternary:'dark':'default'}
    76{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    8 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.`$selectizeTheme`.css"}
     7{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    98
    109{combine_script id='jquery.underscore' load='footer' path='themes/default/js/plugins/underscore.js'}

  • trunk/admin/themes/default/themeconf.inc.php

    r28689 r29389  
    55  'admin_icon_dir' => 'admin/themes/default/icon',
    66  'mime_icon_dir'  => 'themes/default/icon/mimetypes/',
     7  'colorscheme' => 'dark',
    78);
    89?>

  • trunk/admin/themes/roma/themeconf.inc.php

    r5177 r29389  
    33  'name'  => 'roma',
    44  'parent' => 'default',
     5  'colorscheme' => 'dark',
    56);
    67?>

  • trunk/include/template.class.php

    r28917 r29389  
    178178   * @param bool $load_local_head
    179179   */
    180   function set_theme($root, $theme, $path, $load_css=true, $load_local_head=true)
     180  function set_theme($root, $theme, $path, $load_css=true, $load_local_head=true, $colorscheme='dark')
    181181  {
    182182    $this->set_template_dir($root.'/'.$theme.'/'.$path);
    … …  
    204204    }
    205205    $themeconf['id'] = $theme;
     206
     207    if (!isset($themeconf['colorscheme']))
     208    {
     209      $themeconf['colorscheme'] = $colorscheme;
     210    }
     211   
    206212    $this->smarty->append('themes', $tpl_var);
    207213    $this->smarty->append('themeconf', $themeconf, true);

  • trunk/themes/clear/themeconf.inc.php

    r26638 r29389  
    1111  'name'  => 'clear',
    1212  'parent' => 'default',
     13  'colorscheme' => 'clear',
    1314);
    1415?>

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

    r28746 r29389  
    55
    66{combine_script id='jquery.selectize' load='footer' path='themes/default/js/plugins/selectize.min.js'}
    7 {combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.dark.css"}
     7{combine_css id='jquery.selectize' path="themes/default/js/plugins/selectize.{$themeconf.colorscheme}.css"}
    88
    99{footer_script}
Note: See TracChangeset for help on using the changeset viewer.