Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt (revision 1839)
+++ branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt (revision 1840)
@@ -1,5 +1,5 @@
-
+
Index: branches/2.8.x/wb/admin/pages/settings.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings.php (revision 1839)
+++ branches/2.8.x/wb/admin/pages/settings.php (revision 1840)
@@ -5,12 +5,12 @@
* @package pages
* @author Ryan Djurovich, WebsiteBaker Project
* @copyright 2009-2012, WebsiteBaker Org. e.V.
- * @link http://www.websitebaker2.org/
+ * @link http://www.websitebaker2.org/
* @license http://www.gnu.org/licenses/gpl.html
* @platform WebsiteBaker 2.8.x
* @requirements PHP 5.2.2 and higher
* @version $Id$
- * @filesource $HeadURL$
+ * @filesource $HeadURL$
* @lastmodified $Date$
*
*/
@@ -201,7 +201,7 @@
}
/*-- collect page-icons for select boxes -----------------------------------------------*/
- $sAllowedImageTypes = '\.jpg|\.jpeg|\.png|\.gif';
+ $sAllowedImageTypes = '\.jpg|\.jpeg|\.png|\.gif';
$aPageIcons = array();
$aIcon = array();
$sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']);
@@ -417,12 +417,11 @@
// Work-out if page languages feature is enabled
$oTpl->set_block('main_block', 'show_page_code_block', 'show_page_code');
if( (defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) &&
- isset($aCurrentPage['page_code']) &&
- file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php') )
+ isset($aCurrentPage['page_code']) && class_exists('m_MultiLingual_Lib'))
{
// workout field is set but module missing
$oTpl->set_var('TEXT_PAGE_CODE',
- ''.$mLang->TEXT_PAGE_CODE.''
+ ''.$mLang->TEXT_PAGE_CODE.''
);
/*-- begin recursive function page_code list ---------------------------------------*/
function page_code_list($parent)
Property changes on: branches/2.8.x/wb/admin/pages/settings.php
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Date Revision Id HeadURL
\ No newline at end of property
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/admin/pages/settings_save.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings_save.php (revision 1839)
+++ branches/2.8.x/wb/admin/pages/settings_save.php (revision 1840)
@@ -5,12 +5,12 @@
* @package pages
* @author Ryan Djurovich, WebsiteBaker Project
* @copyright 2009-2012, WebsiteBaker Org. e.V.
- * @link http://www.websitebaker2.org/
+ * @link http://www.websitebaker2.org/
* @license http://www.gnu.org/licenses/gpl.html
* @platform WebsiteBaker 2.8.x
* @requirements PHP 5.2.2 and higher
* @version $Id$
- * @filesource $HeadURL$
+ * @filesource $HeadURL$
* @lastmodified $Date$
*
*/
@@ -28,7 +28,8 @@
$lang_dir = dirname(__FILE__).'/languages/';
$lang = file_exists($lang_dir.LANGUAGE.'.php') ? LANGUAGE : 'EN';
-require_once($lang_dir.$lang.'.php');
+//require_once($lang_dir.$lang.'.php');
+if( !isset($TEXT['PAGE_LANG_LOADED']) ) { require($lang_dir.$lang.'.php'); }
// suppress to print the header, so no new FTAN will be set
$admin = new admin('Pages', 'pages_settings',false);
@@ -331,7 +332,7 @@
$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
}
// Move a directory for this page
- if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') && is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/'))
+ if(is_readable(WB_PATH.PAGES_DIRECTORY.$old_link.'/') && is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/'))
{
rename(WB_PATH.PAGES_DIRECTORY.$old_link.'/', WB_PATH.PAGES_DIRECTORY.$link.'/');
}
Index: branches/2.8.x/wb/admin/pages/languages/EN.php
===================================================================
--- branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1839)
+++ branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1840)
@@ -28,6 +28,7 @@
$TEXT['NO_SELECTION'] = 'no selection';
$TEXT['NONE'] = 'None';
$TEXT['PAGE_CODE'] = 'PageLanguageCode';
+$TEXT['PAGE_LANG_LOADED']= 'Pagelanguage loaded';
$TEXT['PAGE_TITLE'] = 'Page Title';
$TEXT['PARENT'] = 'Parent';
$TEXT['PLEASE_SELECT'] = 'Please select';
Index: branches/2.8.x/wb/admin/pages/languages/DE.php
===================================================================
--- branches/2.8.x/wb/admin/pages/languages/DE.php (revision 1839)
+++ branches/2.8.x/wb/admin/pages/languages/DE.php (revision 1840)
@@ -28,6 +28,7 @@
$TEXT['NO_SELECTION'] = 'keine Auswahl';
$TEXT['NONE'] = 'Keine';
$TEXT['PAGE_CODE'] = 'Seitensprachcode';
+$TEXT['PAGE_LANG_LOADED']= 'Seitensprache geladen';
$TEXT['PAGE_TITLE'] = 'Seitentitel';
$TEXT['PARENT'] = 'Übergeordnete Seite';
$TEXT['PLEASE_SELECT'] = 'Bitte auswählen';
Index: branches/2.8.x/wb/admin/pages/sections.php
===================================================================
--- branches/2.8.x/wb/admin/pages/sections.php (revision 1839)
+++ branches/2.8.x/wb/admin/pages/sections.php (revision 1840)
@@ -449,7 +449,7 @@
}
$tpl->set_var(array(
- 'DISPLAY_DEBUG' => ' style="visibility="visible;"',
+ 'DISPLAY_DEBUG' => ' style="visibility:visible;"',
'TEXT_SID' => 'SID',
'DEBUG_COLSPAN_SIZE' => 9
)
@@ -457,7 +457,7 @@
if($debug)
{
$tpl->set_var(array(
- 'DISPLAY_DEBUG' => ' style="visibility="visible;"',
+ 'DISPLAY_DEBUG' => ' style="visibility:visible;"',
'TEXT_PID' => 'PID',
'TEXT_SID' => 'SID',
'POSITION' => $section['position']
Property changes on: branches/2.8.x/wb/admin/pages/sections.php
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Date Revision Id HeadURL
\ No newline at end of property
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php (revision 1839)
+++ branches/2.8.x/wb/admin/interface/version.php (revision 1840)
@@ -51,5 +51,5 @@
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1839');
+if(!defined('REVISION')) define('REVISION', '1840');
if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/settings/save.php
===================================================================
--- branches/2.8.x/wb/admin/settings/save.php (revision 1839)
+++ branches/2.8.x/wb/admin/settings/save.php (revision 1840)
@@ -184,7 +184,6 @@
'page_icon_dir',
'rename_files_on_upload',
'page_spacer',
- 'website_signature',
'page_icon_dir',
'modules_upgrade_list'
);
@@ -197,6 +196,7 @@
'website_title',
'website_description',
'website_keywords',
+ 'website_signature',
'wysiwyg_style',
'pages_directory',
'page_icon_dir',
Property changes on: branches/2.8.x/wb/admin/settings/save.php
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Date Revision Id HeadURL
\ No newline at end of property
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/framework/class.frontend.php
===================================================================
--- branches/2.8.x/wb/framework/class.frontend.php (revision 1839)
+++ branches/2.8.x/wb/framework/class.frontend.php (revision 1840)
@@ -36,7 +36,7 @@
// page details
// page database row
public $page;
- public $page_id,$page_title,$menu_title,$parent,$root_parent,$level,$position,$visibility;
+ public $page_id,$page_code,$page_title,$menu_title,$parent,$root_parent,$level,$position,$visibility;
public $page_description,$page_keywords,$page_link, $page_icon, $menu_icon_0, $menu_icon_1, $tooltip;
public $page_trail=array();
@@ -197,6 +197,9 @@
// Begin code to set details as either variables of constants
// Page ID
if(!defined('PAGE_ID')) {define('PAGE_ID', $this->page['page_id']);}
+ // Page Code
+ if(!defined('PAGE_CODE')) {define('PAGE_CODE', $this->page['page_code']);}
+ $this->page_code = PAGE_CODE;
// Page Title
if(!defined('PAGE_TITLE')) {define('PAGE_TITLE', $this->page['page_title']);}
$this->page_title=PAGE_TITLE;
Property changes on: branches/2.8.x/wb/framework/class.frontend.php
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: svn:keywords
## -1 +1 ##
-Date Revision Id HeadURL
\ No newline at end of property
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/templates/wb_theme/css/screen.css
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1839)
+++ branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1840)
@@ -7,7 +7,7 @@
.td { clear :both; font-size :1.0em; margin :0 auto; text-align :center; width :100%; }
div.main .table { background :url(../images/bgtitle.png) #ffffff repeat-x; margin :0 auto; overflow :auto; width :100%; }
.wrapper { position :relative; display :block; overflow :auto; width :inherit; }
-.content { padding :15px; text-align :left; overflow :hidden; }
+.content { padding :25px 15px; text-align :left; overflow :hidden; }
img { border :none; }
.input_small { width :20px; }
.input_narrow { width :100px; }
@@ -175,12 +175,12 @@
h1, h2, h3, h4, h5, h6 { color :#006699; display :block; font-weight :normal; margin :0.5em auto; padding-bottom :5px; }
h6 { font-size :100%; }
#file_mode,
-#dir_mode { width :290px; height :auto; margin-right :0.5em; font-size :1em; }
+#dir_mode { width :280px; height :auto; margin-right :5px; font-size :1em; float: left; }
#file_mode table,
-#dir_mode table { width :290px; height :auto; margin-right :0.5em; font-size :1em; }
+#dir_mode table { width :280px; height :auto; margin-right :5px; font-size :1em; float: left; }
#file_mode input,
#dir_mode input { width :12px; height :12px; }
-table.permission_box { width :280; border :2px solid #dddddd; }
+table.permission_box { width :280px; border :2px solid #dddddd; }
table.permission_box caption { text-align :center; line-height :30px; font-weight :bold; }
table.permission_box thead { text-align :left; background :#d2e8e8; }
table.permission_box tbody { text-align :left; }
@@ -217,7 +217,7 @@
.list_pubdate_start,
.list_pubdate_end { text-align :left; white-space :nowrap; width :185px; }
.header_list_sections_actions { text-align :left; width :30px; }
-.header_list_type { font-size :1em; padding :4px 0; text-align :left; width :34%; }
+.header_list_type { font-size :1em; padding :4px 0; text-align :left; width :40%; }
.jsadmin_drag img { cursor :pointer; margin-top :0px; padding :0px 0; vertical-align :baseline; }
.list_actions { height :20px; padding :0 1px; text-align :left; width :20px; }
.list_page_code,
@@ -246,7 +246,7 @@
.sections_list,
.pages_list_header { font-weight :bold; line-height :1.5em; margin-bottom :5px; text-align :left; }
.pages_list_header { padding :2px 0px 2px 5px; font-size :1.3em; height :25px; }
-.header_list_menu_title { padding-left :30px; }
+.header_list_menu_title { padding-left :30px; width :400px; }
.value_page_code { color :#006400; font-weight :400; width :240px; }
.section-info { margin :1em auto; }
/* depending styles for /admin/pages_settings */
@@ -333,7 +333,7 @@
.pages_list table td, table.pages_view td {
padding :3px;
- font-size :150%;
+ font-size :130%;
}
select.pages-parent-list {
width: 240px;
Property changes on: branches/2.8.x/wb/templates/wb_theme/css/screen.css
___________________________________________________________________
Modified: svn:eol-style
## -1 +1 ##
-native
\ No newline at end of property
+LF
\ No newline at end of property
Index: branches/2.8.x/wb/templates/argos_theme/css/screen.css
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/css/screen.css (revision 1839)
+++ branches/2.8.x/wb/templates/argos_theme/css/screen.css (revision 1840)
@@ -172,7 +172,7 @@
form input[type="file"] { width :80%; border :1px solid #000000; background-color :#ccccff; }
legend.settings_table ,
form.settings_table legend { border :none; color :#006699; font-size :140%; margin :1em; padding :0; }
- form.settings_table div.sub-row { background-color :transparent !important; background-color :#eeeeee; }
+ form.settings_table div.sub-row { background-color :transparent !important; background-color :#eeeeee; min-width: 900px; }
form.settings_table label { text-align :right; margin :1px auto; }
form.settings_table label.setting_name { clear :left; color :#333333; vertical-align :top; display :block; margin :3px auto; min-height :1.6em; float :left; padding-right :5px; width :30%; }
form.settings_table fieldset div.input { padding :0; margin :0 auto; vertical-align :top; overflow :hidden; display :inline; line-height :2em; min-height :1em; list-style-type :none; width :60%; }
@@ -179,14 +179,14 @@
form.settings_table fieldset div.input input.radio { margin :0.8em auto; border :none; padding-left :6px; }
form.settings_table fieldset div.input label { margin :6px auto; padding-left :6px; min-height :1em; width :35%; float :none; display :inline; vertical-align :top; }
form.settings_table input[type="text"],
- form.settings_table input[type="password"] { border :1px solid #666666; margin :0px auto; padding-left :5px; width :72%; }
+ form.settings_table input[type="password"] { border :1px solid #666666; margin :0px auto; padding-left :5px; width :60%; }
form.settings_table input.radio { border :1px none #666666; margin :0px auto; padding-left :0.5em; height :1em; }
form.settings_table input[type="button"].button { border :1px solid #666666; color :#000000; text-align :left; font-weight :bold; background-color :#dddddd; margin :2px auto; padding :2px 0px 2px 6px; width :70%; }
form.settings_table textarea { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width : 60%; }
- form.settings_table select { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :73%; }
+ form.settings_table select { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :61%; }
/* */
div.content_box form { }
-div.sub-row { background-color :#eeeeee; margin :1px auto; overflow :hidden; padding :0; }
+div.sub-row { background-color :#eeeeee; margin :1px auto; overflow :hidden; padding :0; min-width: 900px; }
div.col_content { margin-right :0.5em; padding :2px 0; }
.content_box { position :relative; margin :0px auto; padding :0; }
.content_box form { background :transparent; height :auto; }
@@ -212,7 +212,7 @@
#dir_mode table { width :290px; height :auto; margin-right :0.5em; font-size :1em; }
#file_mode input,
#dir_mode input { width :12px; height :12px; }
-table.permission_box { width :280; border :2px solid #dddddd; }
+table.permission_box { width :280px; border :2px solid #dddddd; }
table.permission_box caption { text-align :center; line-height :30px; font-weight :bold; }
table.permission_box thead { text-align :left; background :#d2e8e8; }
table.permission_box tbody { text-align :left; }
@@ -242,6 +242,7 @@
.header_list_page_title,
.list_page_title { width :350px; }
.list_page_title, .list_menu_title, .header_list_menu_title, .header_list_type { text-align :left; vertical-align :middle; }
+.header_list_menu_title { padding-left :30px; width :400px; }
.header_list_pubdate_start,
.header_list_pubdate_end,
.list_pubdate_start,
Index: branches/2.8.x/wb/modules/jsadmin/backend.css
===================================================================
--- branches/2.8.x/wb/modules/jsadmin/backend.css (revision 1839)
+++ branches/2.8.x/wb/modules/jsadmin/backend.css (revision 1840)
@@ -9,17 +9,15 @@
line-height: 2em;
}
-body.jsadmin_busy td.content,
-body.jsadmin_busy div.td div.content {
+body.jsadmin_busy .content {
background: url(images/busy.gif) 14px 8px no-repeat;
}
-body.jsadmin_success td.content,
-body.jsadmin_success div.td div.content {
+body.jsadmin_success .content {
background: url(images/success.gif) 14px 8px no-repeat;
}
-body.jsadmin_failure td.content,
-body.jsadmin_failure div.td div.content {
+
+body.jsadmin_failure .content {
background: url(images/failure.gif) 14px 8px no-repeat;
}
Property changes on: branches/2.8.x/wb/modules/jsadmin/backend.css
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property