Changeset 1300

Show
Ignore:
Timestamp:
10/01/07 14:33:36 (1 year ago)
Author:
benoitg
Message:
  • Commited slightly modified patch by Robin Jones to implement #184
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wifidog-auth/CHANGELOG

    r1298 r1300  
    11# $Id$ 
     22007-10-01 Benoit Grégoire  <bock@step.polymtl.ca> 
     3        * Commited slightly modified patch by Robin Jones to implement #184 
     4 
    252007-09-25 Benoit Grégoire  <bock@step.polymtl.ca> 
    36        * Menu.php:  Fix a number of improper call time pass by reference 
    …… 
    69        * locale/gensmarty.pl:  Heads up translators:  There was a bug in the regex; about 20 strings in the smarty templates were missed. 
    710        * Updated french translation 
    8          
     11 
    9122007-09-20 Benoit Grégoire  <bock@step.polymtl.ca> 
    1013        * install.php:  Hopefully fix #384, and remove pages unlikely to be implemented for 1.0 

  • trunk/wifidog-auth/wifidog/classes/MainUI.php

    r1290 r1300  
    436436     * 
    437437     * @param string Stylesheet URL 
    438      * 
    439      * @return void 
    440      * 
    441      * @access public 
    442      */ 
    443     public function appendStylesheetURL($stylesheet_url) { 
     438     *@param media The target media of the selected strylesheet (print, screen,etc.) 
     439     * @return void 
     440     * 
     441     * @access public 
     442     */ 
     443    public function appendStylesheetURL($stylesheet_url, $media=null) { 
    444444        //Note:  using the URL as value AND key will remove duplicate while keeping the stylesheet inclusion order, because of the way foreach is implemented in PHP 
    445         $this->stylesheetUrlArray[$stylesheet_url] = $stylesheet_url; 
     445        $this->stylesheetUrlArray[$stylesheet_url]['href'] = $stylesheet_url; 
     446                $this->stylesheetUrlArray[$stylesheet_url]['media'] = $media; 
    446447    } 
    447448 
    …… 
    544545        // Asign base CSS and theme pack CSS stylesheet 
    545546        $this->appendStylesheetURL(BASE_THEME_URL . STYLESHEET_NAME); 
     547                $this->appendStylesheetURL(BASE_THEME_URL . PRINT_STYLESHEET_NAME, 'print'); 
    546548        $networkThemePack = Network :: getCurrentNetwork()->getThemePack(); 
    547549        if ($networkThemePack) { 

  • trunk/wifidog-auth/wifidog/config.php

    r1249 r1300  
    203203define('NETWORK_THEME_PACKS_DIR', 'media/network_theme_packs/'); 
    204204define('STYLESHEET_NAME', 'stylesheet.css'); 
     205define('PRINT_STYLESHEET_NAME', 'printer.css'); 
    205206define('LOGIN_PAGE_NAME', 'login.html'); 
    206207define('HOTSPOT_STATUS_PAGE', 'hotspot_status.php'); 

  • trunk/wifidog-auth/wifidog/templates/classes/MainUI_Display.tpl

    r1186 r1300  
    5555        <title>{$title}</title> 
    5656        {foreach from=$stylesheetUrlArray item=stylesheetUrl} 
    57           <link rel="stylesheet" type="text/css" href="{$stylesheetUrl}"> 
     57               <link rel="stylesheet" type="text/css" {if !empty($stylesheetUrl.media)}media="{$stylesheetUrl.media}"{/if}     href="{$stylesheetUrl.href}"> 
    5858        {/foreach} 
    5959                <script src="{$base_url_path}js/formutils.js" type="text/javascript"></script>