Project

General

Profile

« Previous | Next » 

Revision 1730

Added by Dietmar about 12 years ago

View differences:

branches/2.8.x/CHANGELOG
13 13 

  		




  14
  14
  
    

  		




  15
  15
  
    

  		




  
  16
  
    
31 Aug-2012 Build 1730 Dietmar Woellbrink (Luisehahne)


  		




  
  17
  
    
+ add gobal javascript var LANGUAGE


  		




  16
  18
  
    
30 Aug-2012 Build 1729 Dietmar Woellbrink (Luisehahne)


  		




  17
  19
  
    
! Fixed missin WB_URL in media_browse


  		




  18
  20
  
    
30 Aug-2012 Build 1728 Dietmar Woellbrink (Luisehahne)


  		












  

    
      branches/2.8.x/wb/admin/skel/themes/htt/header.htt
    
  





  17
  17
  
    
var WB_URL = '{WB_URL}';


  		




  18
  18
  
    
var THEME_URL = '{THEME_URL}';


  		




  19
  19
  
    
var ADMIN_URL = '{ADMIN_URL}';


  		




  
  20
  
    
var LANGUAGE = '{LANGUAGE}';


  		




  20
  21
  
    
</script>


  		




  21
  22
  
    
<script type="text/javascript">


  		




  22
  23
  
    
function confirm_link(message, url) {


  		












  

    
      branches/2.8.x/wb/admin/interface/version.php
    
  





  51
  51
  
    

  		




  52
  52
  
    
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)


  		




  53
  53
  
    
if(!defined('VERSION')) define('VERSION', '2.8.3');


  		




  54
  
  
    
if(!defined('REVISION')) define('REVISION', '1729');


  		




  
  54
  
    
if(!defined('REVISION')) define('REVISION', '1730');


  		




  55
  55
  
    
if(!defined('SP')) define('SP', '');


  		












  

    
      branches/2.8.x/wb/framework/class.admin.php
    
  





  153
  153
  
    
							'CURRENT_USER' => $MESSAGE['START_CURRENT_USER'],


  		




  154
  154
  
    
							'DISPLAY_NAME' => $this->get_display_name(),


  		




  155
  155
  
    
							'CHARSET' => $charset,


  		




  156
  
  
    
							'LANGUAGE' => strtolower(LANGUAGE),


  		




  
  156
  
    
							//'LANGUAGE' => strtolower(LANGUAGE),


  		




  
  157
  
    
							'LANGUAGE' => LANGUAGE,


  		




  157
  158
  
    
							'VERSION' => VERSION,


  		




  158
  159
  
    
							'SP' => (defined('SP') ? SP : ''),


  		




  159
  160
  
    
							'REVISION' => REVISION,


  		












  

    
      branches/2.8.x/wb/framework/frontend.functions.php
    
  





  459
  459
  
    
		/* include the Javascript jquery api  */


  		




  460
  460
  
    
		if( $file_id == 'jquery' AND file_exists(WB_PATH .'/include/jquery/jquery-min.js'))


  		




  461
  461
  
    
        {


  		




  462
  
  
    
            $wbpath = str_replace('\\','/',WB_PATH);  // fixed localhost problem with ie


  		




  
  462
  
    
            $language = LANGUAGE;


  		




  463
  463
  
    
			$jquery_links .= "<script type=\"text/javascript\">\n"


  		




  464
  464
  
    
                ."var URL = '".WB_URL."';\n"


  		




  465
  
  
    
               /* ."var WB_PATH = '".$wbpath."';\n" */


  		




  
  465
  
    
                ."var LANGUAGE = '".$language."';\n"


  		




  466
  466
  
    
                ."var WB_URL = '".WB_URL."';\n"


  		




  467
  467
  
    
                ."var TEMPLATE_DIR = '".TEMPLATE_DIR."';\n"


  		




  468
  468
  
    
                ."</script>\n";


  		












  

    
      branches/2.8.x/wb/templates/wb_theme/templates/header.htt
    
  





  16
  16
  
    
var WB_URL = '{WB_URL}';


  		




  17
  17
  
    
var THEME_URL = '{THEME_URL}';


  		




  18
  18
  
    
var ADMIN_URL = '{ADMIN_URL}';


  		




  
  19
  
    
var LANGUAGE = '{LANGUAGE}';


  		




  19
  20
  
    
</script>


  		




  20
  21
  
    
<script type="text/javascript">


  		




  21
  22
  
    
function confirm_link(message, url) {


  		












  

    
      branches/2.8.x/wb/templates/argos_theme/templates/header.htt
    
  





  16
  16
  
    
var WB_URL = '{WB_URL}';


  		




  17
  17
  
    
var THEME_URL = '{THEME_URL}';


  		




  18
  18
  
    
var ADMIN_URL = '{ADMIN_URL}';


  		




  
  19
  
    
var LANGUAGE = '{LANGUAGE}';


  		




  19
  20
  
    
</script>


  		




  20
  21
  
    
<script src="{WB_URL}/include/jquery/jquery-min.js" type="text/javascript"></script>


  		




  21
  22
  
    
<script src="{WB_URL}/include/jquery/jquery-insert.js" type="text/javascript"></script>


  		












Also available in:  Unified diff