Project

General

Profile

« Previous | Next » 

Revision 1840

Added by Dietmar almost 12 years ago

! settings move website_signature to mailer settings
! fix html validate error in pages sections
! add pages field page_code to class.frontend.php
! optimized jsadmin backend.css

View differences:

branches/2.8.x/CHANGELOG
12 12
===============================================================================
13 13

  
14 14

  
15
23 Dez-2012 Build 1840 Dietmar Woellbrink (Luisehahne)
16
! settings move website_signature to mailer settings
17
! fix html validate error in pages sections
18
! add pages field page_code to class.frontend.php
19
! optimized jsadmin backend.css
15 20
21 Dez-2012 Build 1839 Werner v.d.Decken(DarkViper)
16 21
! the second optimization of runtime by recoding /admin/pages/index.php
17 22
+ new class a_pages_PageTree() for use with /admin/pages/index.php
branches/2.8.x/wb/admin/skel/themes/htt/settings.htt
37 37
			<label class="setting_name">{TEXT_WEBSITE_FOOTER}:</label>
38 38
			<textarea class="vert" name="website_footer" cols="50" rows="4">{WEBSITE_FOOTER}</textarea>
39 39
		</div>
40
		<div class="mbox sub-row">
41
			<label class="setting_name">{TEXT_WEBSITE_SIGNATURE}:</label>
42
			<textarea class="vert" name="website_signature" cols="50" rows="4">{WEBSITE_SIGNATURE}</textarea>
43
		</div>
44 40
	</fieldset>
45 41

  
46 42
	<fieldset>
......
684 680
				<input type="text" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" />
685 681
			</div>
686 682
		</div>
683
		<div class="mbox sub-row">
684
			<label class="setting_name">{TEXT_WEBSITE_SIGNATURE}:</label>
685
			<textarea class="vert" name="website_signature" cols="50" rows="4">{WEBSITE_SIGNATURE}</textarea>
686
		</div>
687 687

  
688 688
		<div class="mbox sub-row">
689 689
	 		<label class="setting_name">{TEXT_WBMAILER_FUNCTION}:</label>
......
698 698
		</div>
699 699

  
700 700
		<div class="mbox sub-row" id="row_wbmailer_smtp_settings"{SMTP_VISIBILITY} >
701
			<div >
702
				<p class="msg-box" style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p>
703
			</div>
701
				<p class="msg-box" style="line-height: 150%; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p>
704 702
		</div>
705 703
		<br />
706 704
		<div class="mbox sub-row" id="row_wbmailer_smtp_host"{SMTP_VISIBILITY} >
branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt
1 1
<!-- BEGIN main_block -->
2
<div class="jsadmin jcalendar hide"></div>
2
<div class="jsadmin jcalendar hide"><!-- INSERT THIS TO LOAD xxx BY JQUERY! --></div>
3 3
<div class="page-info">
4 4
<table>
5 5
<thead>
branches/2.8.x/wb/admin/pages/settings.php
5 5
 * @package         pages
6 6
 * @author          Ryan Djurovich, WebsiteBaker Project
7 7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
8
 * @link			http://www.websitebaker2.org/
8
 * @link            http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
11 11
 * @requirements    PHP 5.2.2 and higher
12 12
 * @version         $Id$
13
 * @filesource		$HeadURL$
13
 * @filesource      $HeadURL$
14 14
 * @lastmodified    $Date$
15 15
 *
16 16
 */
......
201 201
	}
202 202

  
203 203
/*-- collect page-icons for select boxes -----------------------------------------------*/
204
    $sAllowedImageTypes = '\.jpg|\.jpeg|\.png|\.gif';
204
  $sAllowedImageTypes = '\.jpg|\.jpeg|\.png|\.gif';
205 205
	$aPageIcons = array();
206 206
	$aIcon = array();
207 207
	$sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']);
......
417 417
// Work-out if page languages feature is enabled
418 418
	$oTpl->set_block('main_block', 'show_page_code_block',  'show_page_code');
419 419
	if( (defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) &&
420
		 isset($aCurrentPage['page_code']) &&
421
		 file_exists(WB_PATH.'/modules/mod_multilingual/update_keys.php') )
420
		 isset($aCurrentPage['page_code']) && class_exists('m_MultiLingual_Lib'))
422 421
	{
423 422
		// workout field is set but module missing
424 423
		$oTpl->set_var('TEXT_PAGE_CODE',
425
						   '<a href="'.WB_URL.'/modules/mod_multilingual/update_keys.php?page_id='.$page_id.'">'.$mLang->TEXT_PAGE_CODE.'</a>'
424
						   '<a href="'.WB_URL.'/modules/MultiLingual/update_keys.php?page_id='.$page_id.'">'.$mLang->TEXT_PAGE_CODE.'</a>'
426 425
		);
427 426
	/*-- begin recursive function page_code list ---------------------------------------*/
428 427
		function page_code_list($parent)
429 428

  
branches/2.8.x/wb/admin/pages/settings_save.php
5 5
 * @package         pages
6 6
 * @author          Ryan Djurovich, WebsiteBaker Project
7 7
 * @copyright       2009-2012, WebsiteBaker Org. e.V.
8
 * @link			http://www.websitebaker2.org/
8
 * @link            http://www.websitebaker2.org/
9 9
 * @license         http://www.gnu.org/licenses/gpl.html
10 10
 * @platform        WebsiteBaker 2.8.x
11 11
 * @requirements    PHP 5.2.2 and higher
12 12
 * @version         $Id$
13
 * @filesource		$HeadURL$
13
 * @filesource      $HeadURL$
14 14
 * @lastmodified    $Date$
15 15
 *
16 16
 */
......
28 28

  
29 29
$lang_dir = dirname(__FILE__).'/languages/';
30 30
$lang = file_exists($lang_dir.LANGUAGE.'.php') ? LANGUAGE : 'EN';
31
require_once($lang_dir.$lang.'.php');
31
//require_once($lang_dir.$lang.'.php');
32
if( !isset($TEXT['PAGE_LANG_LOADED']) ) { require($lang_dir.$lang.'.php'); }
32 33

  
33 34
// suppress to print the header, so no new FTAN will be set
34 35
$admin = new admin('Pages', 'pages_settings',false);
......
331 332
        	$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
332 333
        }
333 334
		// Move a directory for this page
334
		if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') && is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/'))
335
		if(is_readable(WB_PATH.PAGES_DIRECTORY.$old_link.'/') && is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/'))
335 336
        {
336 337
			rename(WB_PATH.PAGES_DIRECTORY.$old_link.'/', WB_PATH.PAGES_DIRECTORY.$link.'/');
337 338
		}
branches/2.8.x/wb/admin/pages/languages/EN.php
28 28
$TEXT['NO_SELECTION']    = 'no selection';
29 29
$TEXT['NONE']            = 'None';
30 30
$TEXT['PAGE_CODE']       = 'PageLanguageCode';
31
$TEXT['PAGE_LANG_LOADED']= 'Pagelanguage loaded';
31 32
$TEXT['PAGE_TITLE']      = 'Page Title';
32 33
$TEXT['PARENT']          = 'Parent';
33 34
$TEXT['PLEASE_SELECT']   = 'Please select';
branches/2.8.x/wb/admin/pages/languages/DE.php
28 28
$TEXT['NO_SELECTION']    = 'keine Auswahl';
29 29
$TEXT['NONE']            = 'Keine';
30 30
$TEXT['PAGE_CODE']       = 'Seitensprachcode';
31
$TEXT['PAGE_LANG_LOADED']= 'Seitensprache geladen';
31 32
$TEXT['PAGE_TITLE']      = 'Seitentitel';
32 33
$TEXT['PARENT']          = 'Übergeordnete Seite';
33 34
$TEXT['PLEASE_SELECT']   = 'Bitte auswählen';
branches/2.8.x/wb/admin/pages/sections.php
449 449
				}
450 450

  
451 451
					$tpl->set_var(array(
452
									'DISPLAY_DEBUG' => ' style="visibility="visible;"',
452
									'DISPLAY_DEBUG' => ' style="visibility:visible;"',
453 453
									'TEXT_SID' => 'SID',
454 454
									'DEBUG_COLSPAN_SIZE' => 9
455 455
									)
......
457 457
				if($debug)
458 458
		        {
459 459
					$tpl->set_var(array(
460
									'DISPLAY_DEBUG' => ' style="visibility="visible;"',
460
									'DISPLAY_DEBUG' => ' style="visibility:visible;"',
461 461
									'TEXT_PID' => 'PID',
462 462
									'TEXT_SID' => 'SID',
463 463
									'POSITION' => $section['position']
464 464

  
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', '1839');
54
if(!defined('REVISION')) define('REVISION', '1840');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/admin/settings/save.php
184 184
    'page_icon_dir',
185 185
    'rename_files_on_upload',
186 186
    'page_spacer',
187
    'website_signature',
188 187
    'page_icon_dir',
189 188
    'modules_upgrade_list'
190 189
    );
......
197 196
    'website_title',
198 197
    'website_description',
199 198
    'website_keywords',
199
    'website_signature',
200 200
    'wysiwyg_style',
201 201
    'pages_directory',
202 202
    'page_icon_dir',
203 203

  
branches/2.8.x/wb/framework/class.frontend.php
36 36
	// page details
37 37
	// page database row
38 38
	public $page;
39
	public $page_id,$page_title,$menu_title,$parent,$root_parent,$level,$position,$visibility;
39
	public $page_id,$page_code,$page_title,$menu_title,$parent,$root_parent,$level,$position,$visibility;
40 40
	public $page_description,$page_keywords,$page_link, $page_icon, $menu_icon_0, $menu_icon_1, $tooltip;
41 41
	public $page_trail=array();
42 42

  
......
197 197
			// Begin code to set details as either variables of constants
198 198
			// Page ID
199 199
			if(!defined('PAGE_ID')) {define('PAGE_ID', $this->page['page_id']);}
200
			// Page Code
201
			if(!defined('PAGE_CODE')) {define('PAGE_CODE', $this->page['page_code']);}
202
			$this->page_code = PAGE_CODE;
200 203
			// Page Title
201 204
			if(!defined('PAGE_TITLE')) {define('PAGE_TITLE', $this->page['page_title']);}
202 205
			$this->page_title=PAGE_TITLE;
203 206

  
branches/2.8.x/wb/templates/wb_theme/css/screen.css
7 7
.td { clear :both; font-size :1.0em; margin :0 auto; text-align :center; width :100%; }
8 8
div.main .table { background :url(../images/bgtitle.png) #ffffff repeat-x; margin :0 auto; overflow :auto; width :100%; }
9 9
.wrapper { position :relative; display :block; overflow :auto; width :inherit; }
10
.content { padding :15px; text-align :left; overflow :hidden; }
10
.content { padding :25px 15px; text-align :left; overflow :hidden; }
11 11
img { border :none; }
12 12
.input_small { width :20px; }
13 13
.input_narrow { width :100px; }
......
175 175
h1, h2, h3, h4, h5, h6 { color :#006699; display :block; font-weight :normal; margin :0.5em auto; padding-bottom :5px; }
176 176
h6 { font-size :100%; }
177 177
#file_mode, 
178
#dir_mode { width :290px; height :auto; margin-right :0.5em; font-size :1em; }
178
#dir_mode { width :280px; height :auto; margin-right :5px; font-size :1em; float: left; }
179 179
#file_mode table, 
180
#dir_mode table { width :290px; height :auto; margin-right :0.5em; font-size :1em; }
180
#dir_mode table { width :280px; height :auto; margin-right :5px; font-size :1em; float: left; }
181 181
#file_mode input, 
182 182
#dir_mode input { width :12px; height :12px; }
183
table.permission_box { width :280; border :2px solid #dddddd; }
183
table.permission_box { width :280px; border :2px solid #dddddd; }
184 184
table.permission_box caption { text-align :center; line-height :30px; font-weight :bold; }
185 185
table.permission_box thead { text-align :left; background :#d2e8e8; }
186 186
table.permission_box tbody { text-align :left; }
......
217 217
.list_pubdate_start, 
218 218
.list_pubdate_end { text-align :left; white-space :nowrap; width :185px; }
219 219
.header_list_sections_actions { text-align :left; width :30px; }
220
.header_list_type { font-size :1em; padding :4px 0; text-align :left; width :34%; }
220
.header_list_type { font-size :1em; padding :4px 0; text-align :left; width :40%; }
221 221
.jsadmin_drag img { cursor :pointer; margin-top :0px; padding :0px 0; vertical-align :baseline; }
222 222
.list_actions { height :20px; padding :0 1px; text-align :left; width :20px; }
223 223
.list_page_code, 
......
246 246
.sections_list,
247 247
.pages_list_header { font-weight :bold; line-height :1.5em; margin-bottom :5px; text-align :left; }
248 248
.pages_list_header { padding :2px 0px 2px 5px; font-size :1.3em; height :25px; }
249
.header_list_menu_title { padding-left :30px; }
249
.header_list_menu_title { padding-left :30px; width :400px; }
250 250
.value_page_code { color :#006400; font-weight :400; width :240px; }
251 251
.section-info { margin :1em auto; }
252 252
/* depending styles for /admin/pages_settings */
......
333 333

  
334 334
.pages_list table td, table.pages_view td {
335 335
   padding :3px;
336
   font-size :150%;
336
   font-size :130%;
337 337
}
338 338
select.pages-parent-list {
339 339
	width: 240px;
340 340

  
branches/2.8.x/wb/templates/argos_theme/css/screen.css
172 172
   form input[type="file"] { width :80%; border :1px solid #000000; background-color :#ccccff; }
173 173
   legend.settings_table ,
174 174
   form.settings_table legend { border :none; color :#006699; font-size :140%; margin :1em; padding :0; }
175
   form.settings_table div.sub-row { background-color :transparent !important; background-color :#eeeeee; }
175
   form.settings_table div.sub-row { background-color :transparent !important; background-color :#eeeeee; min-width: 900px; }
176 176
   form.settings_table label { text-align :right; margin :1px auto; }
177 177
   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%; }
178 178
   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 179
   form.settings_table fieldset div.input input.radio { margin :0.8em auto; border :none; padding-left :6px; }
180 180
   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; }
181 181
   form.settings_table input[type="text"],
182
   form.settings_table input[type="password"] { border :1px solid #666666; margin :0px auto; padding-left :5px; width :72%; }
182
   form.settings_table input[type="password"] { border :1px solid #666666; margin :0px auto; padding-left :5px; width :60%; }
183 183
   form.settings_table input.radio { border :1px none #666666; margin :0px auto; padding-left :0.5em; height :1em; }
184 184
   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%; }
185 185
   form.settings_table textarea { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width : 60%; }
186
   form.settings_table select { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :73%; }
186
   form.settings_table select { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :61%; }
187 187
/* */
188 188
div.content_box form { }
189
div.sub-row { background-color :#eeeeee; margin :1px auto; overflow :hidden; padding :0; }
189
div.sub-row { background-color :#eeeeee; margin :1px auto; overflow :hidden; padding :0; min-width: 900px; }
190 190
div.col_content { margin-right :0.5em; padding :2px 0; }
191 191
.content_box { position :relative; margin :0px auto; padding :0; }
192 192
   .content_box form { background :transparent; height :auto; }
......
212 212
#dir_mode table { width :290px; height :auto; margin-right :0.5em; font-size :1em; }
213 213
#file_mode input, 
214 214
#dir_mode input { width :12px; height :12px; }
215
table.permission_box { width :280; border :2px solid #dddddd; }
215
table.permission_box { width :280px; border :2px solid #dddddd; }
216 216
table.permission_box caption { text-align :center; line-height :30px; font-weight :bold; }
217 217
table.permission_box thead { text-align :left; background :#d2e8e8; }
218 218
table.permission_box tbody { text-align :left; }
......
242 242
.header_list_page_title, 
243 243
.list_page_title { width :350px; }
244 244
.list_page_title, .list_menu_title, .header_list_menu_title, .header_list_type { text-align :left; vertical-align :middle; }
245
.header_list_menu_title { padding-left :30px; width :400px; }
245 246
.header_list_pubdate_start, 
246 247
.header_list_pubdate_end, 
247 248
.list_pubdate_start, 
branches/2.8.x/wb/modules/jsadmin/backend.css
9 9
    line-height: 2em;
10 10
}
11 11

  
12
body.jsadmin_busy td.content,
13
body.jsadmin_busy div.td div.content {
12
body.jsadmin_busy .content {
14 13
	background: url(images/busy.gif) 14px 8px no-repeat;
15 14
}
16 15

  
17
body.jsadmin_success td.content,
18
body.jsadmin_success div.td div.content {
16
body.jsadmin_success .content {
19 17
	background: url(images/success.gif) 14px 8px no-repeat;
20 18
}
21
body.jsadmin_failure td.content,
22
body.jsadmin_failure div.td div.content {
19

  
20
body.jsadmin_failure .content {
23 21
	background: url(images/failure.gif) 14px 8px no-repeat;
24 22
}
25 23

  
26 24

  

Also available in: Unified diff