Project

General

Profile

« Previous | Next » 

Revision 1766

Added by Dietmar about 12 years ago

! typofix in EN language,
! empty seo_title will set to menu_title
! continue rebranding wb_theme

View differences:

branches/2.8.x/CHANGELOG
13 13

  
14 14

  
15 15

  
16
22 Sep-2012 Build 1766 Dietmar Woellbrink (Luisehahne)
17
! typofix in EN language,
18
! empty seo_title will set to menu_title
19
! continue  rebranding wb_theme
16 20
22 Sep-2012 Build 1765 Dietmar Woellbrink (Luisehahne)
17 21
! recoded module news,form,wysiwyg upgrade to work with upgrade-script
18 22
22 Sep-2012 Build 1764 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/pages/settings.php
279 279
			// check already selected groups
280 280
				$bChecked = $admin->is_group_match($aGroup['ID'], $aCurrentPage['admin_groups']);
281 281
			// disable selected groups where current user is not member of
282
				$bDisabled = !$admin->ami_group_member($aGroup['ID']);
282
				$bDisabled = !$admin->ami_group_member('1');
283 283
				$aGroup['CHECKED']  = $bChecked ? $sChecked : '';
284 284
				$aGroup['DISABLED'] = ($bChecked && $bDisabled) ? $sDisabled : '';
285 285
			}
......
306 306
			// check already selected groups
307 307
				$bChecked = $admin->is_group_match($aGroup['ID'], $aCurrentPage['viewing_groups']);
308 308
			// disable selected groups where current user is not member of
309
				$bDisabled = !$admin->ami_group_member($aGroup['ID']);
309
				$bDisabled = !$admin->ami_group_member('1');
310 310
				$aGroup['CHECKED']  = $bChecked ? $sChecked : '';
311 311
				$aGroup['DISABLED'] = ($bChecked && $bDisabled) ? $sDisabled : '';
312 312
			}
branches/2.8.x/wb/admin/pages/settings_save.php
100 100
}
101 101
if($seo_title == '' || substr($seo_title,0,1)=='.')
102 102
{
103
	$admin->print_error($MESSAGE['PAGES_BLANK_SEO_TITLE'],$target_url);
103
    $seo_title = $menu_title;
104 104
}
105 105

  
106 106
// Get existing perms
......
287 287

  
288 288
		// Create access file
289 289
		create_access_file($filename,$page_id,$level);
290
        if(!file_exists($filename)) {
291
        	$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
292
        }
290 293
		// Move a directory for this page
291 294
		if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') && is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/'))
292 295
        {
......
318 321
                    {
319 322
						unlink($old_subpage_file);
320 323
					}
321
					create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION, $sub['page_id'], $new_sub_level);
324
                    $sAccessFile = WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION;
325
					create_access_file($sAccessFile, $sub['page_id'], $new_sub_level);
326
                    if(!file_exists($sAccessFile)) {
327
                    	$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
328
                    }
329

  
322 330
				}
323 331
			}
324 332
		}
branches/2.8.x/wb/admin/pages/languages/EN.php
59 59
$TEXT['MENU_ICON_1_DIR']      = 'Folder Menu image hover';
60 60

  
61 61
$MESSAGE['PAGES_LAST_MODIFIED'] = 'Last modification by';
62
$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a sro title';
62
$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a Seo Title';
63 63

  
64 64

  
65 65
$HELP['PAGE_IMAGE_DIR']  = '<p>The topical side picture path is<br /> <b>{{icon_dir}}</b>.</p>';
branches/2.8.x/wb/admin/pages/add.php
222 222
// Create a new file in the /pages dir
223 223
create_access_file($filename, $page_id, $level);
224 224

  
225
if(!file_exists($filename)) {
226
	$admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']);
227
}
228

  
225 229
// add position 1 to new page
226 230
$position = 1;
227 231

  
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', '1765');
54
if(!defined('REVISION')) define('REVISION', '1766');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/templates/wb_theme/css/screen.css
50 50
.spacer { line-height :1em; margin-right :0.5em; position :relative; }
51 51
/* ************************************************************************** */
52 52
/* DIV-mbox to show selector or simply content only ************************* */
53
div.mbox { padding :10px; margin :15px auto; background-color :#ffffff; color :#330033; font-size :1em; display :block; }
53
div.mbox {
54
   padding : 5px 10px;
55
   margin : 5px auto;
56
   background-color :#ffffff;
57
   color :#330033;
58
   font-size :1em;
59
   display :block;
60
}
54 61
 	div.mbox div { }
55 62
		div.mbox div a { font-size :1em; color :#0052a1; }
56 63
		div.mbox div a:hover { color :#0099ff; }
......
58 65
		div.mbox div p { margin :0; padding :0 0 0.6em 0; }
59 66
div.mbox:hover { }
60 67
/* extension for mbox to show additional icons on left side ***************** */
61
div.mbox-icon { background-repeat :no-repeat; background-image :url(icons/info_50.png); background-position :15px 50%; padding :15px; min-height :25px; }
62
	div.mbox-icon div { margin-left :70px; border-left :0px outset; padding-left :5px; }
68
div.mbox-icon {
69
   background-repeat :no-repeat;
70
   background-image :url(icons/info_50.png);
71
   background-position :15px 50%;
72
   padding : 10px 5px;
73
   min-height :25px;
74
}
75
	div.mbox-icon div {
76
   margin-left :70px;
77
   border-left :0px outset;
78
   padding-left :5px;
79
}
63 80
div.mbox-icon16 { background-repeat :no-repeat; background-image :url(icons/info_16.png); background-position :5px 50%; padding :5px; min-height :10px; }
64 81
	div.mbox-icon16 div { margin-left :30px; border-left :4px outset; padding-left :5px; }
65 82
/* coloring of the mbox and other boxes also ******************************** */
......
146 163
div.content_box form { }
147 164
div.sub-row { background-color :#eeeeee; margin : 1px auto; overflow :hidden; padding :0; }
148 165
div.col_content { margin-right :0.5em; padding :2px 0; }
149
.content_box { position :relative; margin :0px auto; padding :0; overflow :visible; }
166
.content_box { position :relative; margin :0px auto; padding :0; }
150 167
   .content_box form { background :transparent; height :auto; }
151
   .content_box li { float :left; margin :auto 0.8em; list-style-type :none; display :block; }
168
   .content_box li {
169
   float :left;
170
   padding :0 10px;
171
   list-style-type :none;
172
   display :block;
173
}
152 174
   .content_box ul { padding :0 0 0 15px; margin :0 auto; width :100%; }
153 175
   .content_box h5.title { color :#339bff; font-weight :bold; font-size :1.2em; margin :0 auto; text-align :left; }
154 176
   .content_box h5.title a:link  { color :#0067ca; }
......
267 289
div.page-settings p.page_group {  } 
268 290
/* */
269 291
.header_title, .setting_value input, .setting_value select, .setting_value textarea, .value_input input, .value_input text, .value_input select, .form_submit, .input_full { width :80%; }
270
.content_box { text-align :left; }
271 292
div.mbox span { white-space :nowrap; }
272 293
div.mbox span label { padding-right :5px; }
273 294
div.mbox span [type="checkbox"] { width :2.5em; }

Also available in: Unified diff