Project

General

Profile

« Previous | Next » 

Revision 1677

Added by Dietmar over 12 years ago

! preparing new groups management and page settings
! upgrade-script insert or update page access files

View differences:

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

  
14 14

  
15
24 Apr-2012 Build 1677 Dietmar Woellbrink (Luisehahne)
16
! preparing new groups management and page settings
17
! upgrade-script insert or update page access files
15 18
24 Apr-2012 Build 1676 Dietmar Woellbrink (Luisehahne)
16 19
# fixed backup_droplets working with php as Apache Module (Tks to Ruebenwurzel)
17 20
! update function rm_full_dir in /framework/functions.php
branches/2.8.x/wb/upgrade-script.php
15 15
 *
16 16
 */
17 17

  
18
@require_once('config.php');
18
require_once('config.php');
19 19

  
20 20
require_once(WB_PATH.'/framework/functions.php');
21 21
require_once(WB_PATH.'/framework/class.admin.php');
22 22
require_once(WB_PATH.'/framework/class.database.php');
23 23
$admin = new admin('Addons', 'modules', false, false);
24 24

  
25
/* display a status message on the screen **************************************
26
 * @param string $message: the message to show
27
 * @param string $class:   kind of message as a css-class
28
 * @param string $element: witch HTML-tag use to cover the message
29
 * @return void
30
 */
31
function status_msg($message, $class='check', $element='span')
32
{
33
	// returns a status message
34
	$msg  = '<'.$element.' class="'.$class.'">';
35
	$msg .= '<strong>'.strtoupper(strtok($class, ' ')).'</strong>';
36
	$msg .= $message.'</'.$element.'>';
37
	echo $msg;
38
}
25
$oldVersion  = 'Version '.WB_VERSION;
26
$oldVersion .= (defined('WB_SP') ? ' '.WB_SP : '');
27
$oldVersion .= (defined('WB_REVISION') ? ' Revision ['.WB_REVISION.'] ' : '') ;
28
$newVersion  = 'Version '.VERSION;
29
$newVersion .= (defined('SP') ? ' '.SP : '');
30
$newVersion .= (defined('REVISION') ? ' Revision ['.REVISION.'] ' : '');
39 31

  
32
// set addition settings if not exists, otherwise upgrade will be breaks
33
if(!defined('WB_SP')) { define('WB_SP',''); }
34
if(!defined('WB_REVISION')) { define('WB_REVISION',''); }
35

  
40 36
// database tables including in WB package
41
$table_list = array (
37
$aTable = array (
42 38
    'settings','groups','addons','pages','sections','search','users',
43 39
    'mod_captcha_control','mod_code','mod_droplets','mod_form_fields',
44 40
    'mod_form_settings','mod_form_submissions','mod_jsadmin','mod_menu_link',
......
49 45
$OK            = ' <span class="ok">OK</span> ';
50 46
$FAIL          = ' <span class="error">FAILED</span> ';
51 47
$DEFAULT_THEME = 'wb_theme';
48

  
52 49
$stepID = 0;
53 50
$dirRemove = array(
54 51
/*
......
139 136
		 );
140 137
}
141 138

  
139
/* display a status message on the screen **************************************
140
 * @param string $message: the message to show
141
 * @param string $class:   kind of message as a css-class
142
 * @param string $element: witch HTML-tag use to cover the message
143
 * @return void
144
 */
145
function status_msg($message, $class='check', $element='span')
146
{
147
	// returns a status message
148
	$msg  = '<'.$element.' class="'.$class.'">';
149
	$msg .= '<strong>'.strtoupper(strtok($class, ' ')).'</strong>';
150
	$msg .= $message.'</'.$element.'>';
151
	echo $msg;
152
}
153

  
142 154
// analyze/check database tables
143 155
function mysqlCheckTables( $dbName )
144 156
{
145
    global $table_list;
157
    global $aTable;
146 158
    $table_prefix = TABLE_PREFIX;
147 159
    $sql = "SHOW TABLES FROM " . $dbName;
148 160
    $result = @mysql_query( $sql );
149 161
    $data = array();
150 162
    $x = 0;
151 163

  
152
    while( ( $row = @mysql_fetch_array( $result, MYSQL_NUM ) ) == true )
164
    while( ( $row = mysql_fetch_array( $result, MYSQL_NUM ) ) == true )
153 165
    {
154 166
        $tmp = str_replace($table_prefix, '', $row[0]);
155 167

  
156
        if( stristr( $row[0], $table_prefix )&& in_array($tmp,$table_list) )
168
        if( stristr( $row[0], $table_prefix )&& in_array($tmp,$aTable) )
157 169
        {
158 170
            $sql = "CHECK TABLE " . $dbName . '.' . $row[0];
159
            $analyze = @mysql_query( $sql );
160
            $rowFetch = @mysql_fetch_array( $analyze, MYSQL_ASSOC );
171
            $analyze = mysql_query( $sql );
172
            $rowFetch = mysql_fetch_array( $analyze, MYSQL_ASSOC );
161 173
            $data[$x]['Op'] = $rowFetch["Op"];
162 174
            $data[$x]['Msg_type'] = $rowFetch["Msg_type"];
163 175
            $msgColor = '<span class="error">';
......
175 187
// check existings tables for upgrade or install
176 188
function check_wb_tables()
177 189
{
178
    global $database,$table_list;
190
    global $database,$aTable;
179 191

  
180 192
 // if prefix inludes '_' or '%'
181 193
 $search_for = addcslashes ( TABLE_PREFIX, '%_' );
......
188 200
            while ($data = $get_result->fetchRow())
189 201
            {
190 202
                $tmp = str_replace(TABLE_PREFIX, '', $data[0]);
191
                if(in_array($tmp,$table_list))
203
                if(in_array($tmp,$aTable))
192 204
                {
193 205
                    $all_tables[] = $tmp;
194 206
                }
......
290 302
		exit();
291 303
	}
292 304

  
293
$oldVersion  = 'Version '.WB_VERSION;
294
$oldVersion .= (defined('WB_SP') ? ' '.WB_SP : '');
295
$oldVersion .= (defined('WB_REVISION') ? ' Revision ['.WB_REVISION.'] ' : '') ;
296
$newVersion  = 'Version '.VERSION;
297
$newVersion .= (defined('SP') ? ' '.SP : '');
298
$newVersion .= (defined('REVISION') ? ' Revision ['.REVISION.'] ' : '');
299
// set addition settings if not exists, otherwise upgrade will be breaks
300
if(!defined('WB_SP')) { define('WB_SP',''); }
301
if(!defined('WB_REVISION')) { define('WB_REVISION',''); }
302

  
303 305
?>
304 306
<p>This script upgrades an existing WebsiteBaker <strong> <?php echo $oldVersion; ?></strong> installation to the <strong> <?php echo $newVersion ?> </strong>.<br />The upgrade script alters the existing WB database to reflect the changes introduced with WB 2.8.x</p>
305 307

  
......
353 355
    {
354 356
        status_msg('<strong>WARNING:</strong><br />can\'t run Upgrade, missing tables', 'warning', 'div');
355 357
    	echo '<h4>Missing required tables. You can install them in backend->addons->modules->advanced. Then again run upgrade-script.php</h4>';
356
        $result = array_diff ( $table_list, $all_tables );
358
        $result = array_diff ( $aTable, $all_tables );
357 359
        echo '<h4 class="warning"><br />';
358 360
        while ( list ( $key, $val ) = each ( $result ) )
359 361
        {
......
448 450

  
449 451
echo (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
450 452

  
451
if(version_compare(WB_REVISION, '1671', '<'))
453
if(version_compare(WB_REVISION, '1675', '<'))
452 454
{
453 455
	echo '<h3>Step '.(++$stepID).': Updating core tables</h3>';
454 456

  
......
594 596
		print '<br /><strong>Upgrade '.MEDIA_DIRECTORY.'/ protect files</strong>'." $FAIL!<br />";
595 597
		print implode ('<br />',$array);
596 598
	}
599

  
597 600
/**********************************************************
601
 * upgrade pages folder index access files
602
 */
603
	echo '<h4>Upgrade /pages/ index.php access files</h4><br />';
604
    ///**********************************************************
605
    // *  - Reformat/rebuild all existing access files
606
    // */
607
    $msg[] = "All existing access files anew format";
608
    $sql = 'SELECT `page_id`,`link`, `level` FROM `'.TABLE_PREFIX.'pages` ORDER BY `link`';
609
    if (($res_pages = $database->query($sql)))
610
    {
611
        $x = 0;
612
        while (($rec_page = $res_pages->fetchRow()))
613
        {
614
            $filename = WB_PATH.PAGES_DIRECTORY.$rec_page['link'].PAGE_EXTENSION;
615
            $msg = create_access_file($filename, $rec_page['page_id'], $rec_page['level']);
616
            $x++;
617
        }
618
        $msg[] = '<strong>Number of the anew formatted access files: '.$x.'</strong><br />';
619
    }
620

  
621
	print implode ('<br />',$msg);
622

  
623
/*
624
	if( sizeof( $msg ) ){
625

  
626
		print '<br /><strong>Upgrade '.sizeof( $msg ).' /pages/ access files</strong>'." $OK<br />";
627
	} else {
628
		print '<br /><strong>Upgrade /pages/ access files</strong>'." $FAIL!<br />";
629
		print implode ('<br />',$msg);
630
	}
631
*/
632
/**********************************************************
598 633
 * upgrade posts folder index protect files
599 634
 */
600 635
	$sPostsPath = WB_PATH.PAGES_DIRECTORY.'/posts';
......
606 641
		print '<br /><strong>Upgrade /posts/ protect files</strong>'." $FAIL!<br />";
607 642
		print implode ('<br />',$array);
608 643
	}
644

  
609 645
/* *****************************************************************************
610 646
 * - check for deprecated / never needed files
611 647
 */
branches/2.8.x/wb/admin/skel/themes/htt/message.htt
1
<!-- BEGIN main_block -->
2
<div id="{ID}" class="mbox curved mbox-icon16{BOX_STATUS}" style="background-image: url({THEME_URL}/icons/{STATUS}_16.png)">
3
	<div><!-- class="big"> -->
4
		{MESSAGE}
5
	</div>
6
</div>
7
<!-- END main_block -->
0 8

  
branches/2.8.x/wb/admin/skel/themes/htt/footer.htt
3 3
</tr>
4 4
</table>
5 5

  
6
<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0px 10px 0px;">
6
<table class="footer" summary="" cellpadding="0" cellspacing="0" border="0">
7 7
<tr>
8 8
	<td style="font-size: 12px; text-align:center;">
9 9
      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
......
14 14
</tr>
15 15
</table>
16 16
<!-- BEGIN show_debug_block -->
17
<div style="position: relative; width:998px;margin:15px auto;" class="shadow">
18
	<div style="padding:10px;left:0; z-index:10; background-color:#dddddd;color:#dd0000;">
19
		Memory Limit: {FILESIZE}&nbsp;|&nbsp;
20
		Used Memory: {MEMORY}&nbsp;|&nbsp;
17
<div class="mbox dev-info">
18
	<div style="text-align:left; width: auto;">
19
		<span class="">Memory Limit: {FILESIZE}&nbsp;|&nbsp;</span>
20
		<span class="">Used Memory: {MEMORY}&nbsp;|&nbsp;</span>
21 21
		<span class="">SQL-Queries executed: {QUERIES}&nbsp;|&nbsp;</span>
22
		Included&nbsp;{INCLUDES}&nbsp;files &nbsp;|&nbsp;{TXT_SUM_FILESIZE}{SUM_FILESIZE}
22
		<span class="">Summary size of {INCLUDES} included files: {SUM_FILESIZE}</span>
23 23
	<!-- BEGIN show_block_list -->
24 24
		<ul style="margin-left: 27px; margin-top: 0;">
25 25
		<!-- BEGIN include_block_list -->
......
30 30
	</div>
31 31
</div>
32 32
<!-- END show_debug_block -->
33
</div>
33 34
{BACKEND_BODY_MODULE_JS}
34 35
</body>
35 36
</html>
branches/2.8.x/wb/admin/skel/themes/htt/success.htt
1 1
<!-- BEGIN main_block -->
2
<div class="msg-box rounded">
2
<div class="msg-box rounded center">
3 3
	<p>{MESSAGE}</p>
4 4
<!-- BEGIN show_redirect_block -->
5 5
 <script type="text/javascript">
branches/2.8.x/wb/admin/skel/themes/htt/header.htt
10 10
<meta name="author" content="WebsiteBaker Org e.V." />
11 11
<meta http-equiv="Content-Encoding" content="gzip" />
12 12
<meta http-equiv="Accept-Encoding" content="gzip, deflate" />
13
<link href="{THEME_URL}/normalize.css" rel="stylesheet" type="text/css" />
13 14
<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
14 15
{BACKEND_MODULE_CSS}
15 16
<script type="text/javascript">
......
31 32
</script>
32 33
</head>
33 34
<body>
34
<table summary="" class="header">
35
<div class="main">
36

  
37
<table summary="" class="header layout">
35 38
<tr>
36
	<td>
39
	<td class="logo">
37 40
		<a href="{ADMIN_URL}" title="{TITLE_START}"><img src="{THEME_URL}/images/logo.png" border="0" alt="Logo" /></a>
38 41
	</td>
39
	<td>&nbsp;</td>
40
	<td class="menue">
42
	<td class="topnav">
41 43
         <a href="{ADMIN_URL}" title="{TITLE_START}"><img src="{THEME_URL}/images/home.png" border="0" alt="{TITLE_START}" /></a>
42 44
         &nbsp;&nbsp;<a href="{URL_VIEW}" target="_blank" title="{TITLE_VIEW}"><img src="{THEME_URL}/images/view.png" border="0" alt="{WB_URL}" /></a>
43 45
	&nbsp; <a href="{URL_HELP}" target="_blank" title="{TITLE_HELP}"><img src="{THEME_URL}/images/help.png" border="0" alt="{TITLE_HELP}" /></a>
......
53 55
<table summary="" class="container">
54 56
<tr>
55 57
	<td>
56
		<ul class="menu">
58
		<div class="menu">
59
			<ul>
57 60
			<!-- BEGIN linkBlock -->
58 61
			<li class="{CLASS}"><a href="{LINK}" target="{TARGET}">{TITLE}</a></li>
59 62
			<!-- END linkBlock -->
60 63
		</ul>
64
		</div>
61 65
	</td>
62 66
</tr>
63 67
<tr>
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', '1676');
54
if(!defined('REVISION')) define('REVISION', '1677');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/templates/wb_theme/normalize.css
1
/*! normalize.css 2011-09-22T17:42 UTC - http://github.com/necolas/normalize.css */
2

  
3
/* =============================================================================
4
   HTML5 display definitions
5
   ========================================================================== */
6

  
7
/*
8
 * Corrects block display not defined in IE6/7/8/9 & FF3
9
 */
10

  
11
article,
12
aside,
13
details,
14
figcaption,
15
figure,
16
footer,
17
header,
18
hgroup,
19
nav,
20
section {
21
    display: block;
22
}
23

  
24
/*
25
 * Corrects inline-block display not defined in IE6/7/8/9 & FF3
26
 */
27

  
28
audio,
29
canvas,
30
video {
31
    display: inline-block;
32
    *display: inline;
33
    *zoom: 1;
34
}
35

  
36
/*
37
 * Prevents modern browsers from displaying 'audio' without controls
38
 */
39

  
40
audio:not([controls]) {
41
    display: none;
42
}
43

  
44
/*
45
 * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4
46
 * Known issue: no IE6 support
47
 */
48

  
49
[hidden] {
50
    display: none;
51
}
52

  
53

  
54
/* =============================================================================
55
   Base
56
   ========================================================================== */
57

  
58
/*
59
 * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
60
 *    http://clagnut.com/blog/348/#c790
61
 * 2. Keeps page centred in all browsers regardless of content height
62
 * 3. Prevents iOS text size adjust after orientation change, without disabling user zoom
63
 *    www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
64
 */
65

  
66
html {
67
    font-size: 100%; /* 1 */
68
    overflow-y: scroll; /* 2 */
69
    -webkit-text-size-adjust: 100%; /* 3 */
70
    -ms-text-size-adjust: 100%; /* 3 */
71
}
72

  
73
/*
74
 * Addresses margins handled incorrectly in IE6/7
75
 */
76

  
77
body {
78
    margin: 0;
79
}
80

  
81
/* 
82
 * Addresses font-family inconsistency between 'textarea' and other form elements.
83
 */
84

  
85
body,
86
button,
87
input,
88
select,
89
textarea {
90
    font-family: sans-serif;
91
}
92

  
93

  
94
/* =============================================================================
95
   Links
96
   ========================================================================== */
97

  
98
a {
99
    color: #00e;
100
}
101

  
102
a:visited {
103
    color: #551a8b;
104
}
105

  
106
/*
107
 * Addresses outline displayed oddly in Chrome
108
 */
109

  
110
a:focus {
111
    outline: thin dotted;
112
}
113

  
114
/*
115
 * Improves readability when focused and also mouse hovered in all browsers
116
 * people.opera.com/patrickl/experiments/keyboard/test
117
 */
118

  
119
a:hover,
120
a:active {
121
    outline: 0;
122
}
123

  
124

  
125
/* =============================================================================
126
   Typography
127
   ========================================================================== */
128

  
129
/*
130
 * Addresses styling not present in IE7/8/9, S5, Chrome
131
 */
132

  
133
abbr[title] {
134
    border-bottom: 1px dotted;
135
}
136

  
137
/*
138
 * Addresses style set to 'bolder' in FF3/4, S4/5, Chrome
139
*/
140

  
141
b, 
142
strong { 
143
    font-weight: bold; 
144
}
145

  
146
blockquote {
147
    margin: 1em 40px;
148
}
149

  
150
/*
151
 * Addresses styling not present in S5, Chrome
152
 */
153

  
154
dfn {
155
    font-style: italic;
156
}
157

  
158
/*
159
 * Addresses styling not present in IE6/7/8/9
160
 */
161

  
162
mark {
163
    background: #ff0;
164
    color: #000;
165
}
166

  
167
/*
168
 * Corrects font family set oddly in IE6, S4/5, Chrome
169
 * en.wikipedia.org/wiki/User:Davidgothberg/Test59
170
 */
171

  
172
pre,
173
code,
174
kbd,
175
samp {
176
    font-family: monospace, serif;
177
    _font-family: 'courier new', monospace;
178
    font-size: 1em;
179
}
180

  
181
/*
182
 * Improves readability of pre-formatted text in all browsers
183
 */
184

  
185
pre {
186
    white-space: pre;
187
    white-space: pre-wrap;
188
    word-wrap: break-word;
189
}
190

  
191
/*
192
 * 1. Addresses CSS quotes not supported in IE6/7
193
 * 2. Addresses quote property not supported in S4
194
 */
195

  
196
/* 1 */
197

  
198
q {
199
    quotes: none;
200
}
201

  
202
/* 2 */
203

  
204
q:before,
205
q:after {
206
    content: '';
207
    content: none;
208
}
209

  
210
small {
211
    font-size: 75%;
212
}
213

  
214
/*
215
 * Prevents sub and sup affecting line-height in all browsers
216
 * gist.github.com/413930
217
 */
218

  
219
sub,
220
sup {
221
    font-size: 75%;
222
    line-height: 0;
223
    position: relative;
224
    vertical-align: baseline;
225
}
226

  
227
sup {
228
    top: -0.5em;
229
}
230

  
231
sub {
232
    bottom: -0.25em;
233
}
234

  
235

  
236
/* =============================================================================
237
   Lists
238
   ========================================================================== */
239

  
240
ul,
241
ol {
242
    margin: 1em 0;
243
    padding: 0 0 0 40px;
244
}
245

  
246
dd {
247
    margin: 0 0 0 40px;
248
}
249

  
250
nav ul,
251
nav ol {
252
    list-style: none;
253
    list-style-image: none;
254
}
255

  
256

  
257
/* =============================================================================
258
   Embedded content
259
   ========================================================================== */
260

  
261
/*
262
 * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3
263
 * 2. Improves image quality when scaled in IE7
264
 *    code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
265
 */
266

  
267
img {
268
    border: 0; /* 1 */
269
    -ms-interpolation-mode: bicubic; /* 2 */
270
}
271

  
272
/*
273
 * Corrects overflow displayed oddly in IE9 
274
 */
275

  
276
svg:not(:root) {
277
    overflow: hidden;
278
}
279

  
280

  
281
/* =============================================================================
282
   Figures
283
   ========================================================================== */
284

  
285
/*
286
 * Addresses margin not present in IE6/7/8/9, S5, O11
287
 */
288

  
289
figure {
290
    margin: 0;
291
}
292

  
293

  
294
/* =============================================================================
295
   Forms
296
   ========================================================================== */
297

  
298
/*
299
 * Corrects margin displayed oddly in IE6/7
300
 */
301

  
302
form {
303
    margin: 0;
304
}
305

  
306
/*
307
 * Define consistent border, margin, and padding
308
 */
309

  
310
fieldset {
311
    border: 1px solid #c0c0c0;
312
    margin: 0 2px;
313
    padding: 0.35em 0.625em 0.75em;
314
}
315

  
316
/*
317
 * 1. Corrects color not being inherited in IE6/7/8/9
318
 * 2. Corrects alignment displayed oddly in IE6/7
319
 */
320

  
321
legend {
322
    border: 0; /* 1 */
323
    *margin-left: -7px; /* 2 */
324
}
325

  
326
/*
327
 * 1. Corrects font size not being inherited in all browsers
328
 * 2. Addresses margins set differently in IE6/7, FF3/4, S5, Chrome
329
 * 3. Improves appearance and consistency in all browsers
330
 */
331

  
332
button,
333
input,
334
select,
335
textarea {
336
    font-size: 100%; /* 1 */
337
    margin: 0; /* 2 */
338
    vertical-align: baseline; /* 3 */
339
    *vertical-align: middle; /* 3 */
340
}
341

  
342
/*
343
 * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
344
 */
345

  
346
button,
347
input {
348
    line-height: normal; /* 1 */
349
}
350

  
351
/*
352
 * 1. Improves usability and consistency of cursor style between image-type 'input' and others
353
 * 2. Corrects inability to style clickable 'input' types in iOS
354
 * 3. Corrects inner spacing displayed oddly in IE7 without effecting normal text inputs
355
 *    Known issue: inner spacing remains in IE6
356
 */
357

  
358
button,
359
input[type="button"], 
360
input[type="reset"], 
361
input[type="submit"] {
362
    cursor: pointer; /* 1 */
363
    -webkit-appearance: button; /* 2 */
364
    *overflow: visible;  /* 3 */
365
}
366

  
367
/*
368
 * 1. Addresses box sizing set to content-box in IE8/9
369
 * 2. Addresses excess padding in IE8/9
370
 */
371

  
372
input[type="checkbox"],
373
input[type="radio"] {
374
    box-sizing: border-box; /* 1 */
375
    padding: 0; /* 2 */
376
}
377

  
378
/*
379
 * 1. Addresses appearance set to searchfield in S5, Chrome
380
 * 2. Addresses box sizing set to border-box in S5, Chrome (include -moz to future-proof)
381
 */
382

  
383
input[type="search"] {
384
    -webkit-appearance: textfield; /* 1 */
385
    -moz-box-sizing: content-box;
386
    -webkit-box-sizing: content-box; /* 2 */
387
    box-sizing: content-box;
388
}
389

  
390
/*
391
 * Corrects inner padding displayed oddly in S5, Chrome on OSX
392
 */
393

  
394
input[type="search"]::-webkit-search-decoration {
395
    -webkit-appearance: none;
396
}
397

  
398
/*
399
 * Corrects inner padding and border displayed oddly in FF3/4
400
 * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
401
 */
402

  
403
button::-moz-focus-inner,
404
input::-moz-focus-inner {
405
    border: 0;
406
    padding: 0;
407
}
408

  
409
/*
410
 * 1. Removes default vertical scrollbar in IE6/7/8/9
411
 * 2. Improves readability and alignment in all browsers
412
 */
413

  
414
textarea {
415
    overflow: auto; /* 1 */
416
    vertical-align: top; /* 2 */
417
}
418

  
419

  
420
/* =============================================================================
421
   Tables
422
   ========================================================================== */
423

  
424
/* 
425
 * Remove most spacing between table cells
426
 */
427

  
428
table {
429
    border-collapse: collapse;
430
    border-spacing: 0;
431
}
0 432

  
branches/2.8.x/wb/templates/wb_theme/theme.css
160 160
button.status { cursor :pointer; border-radius :5px; -khtml-border-radius :5px; -webkit-border-radius :5px; -moz-border-radius :5px; }
161 161

  
162 162
/* depending styles for /admin/pages_settings */
163
div.page-settings { font-size: 0.9em; }
164
	div.page-settings label { display: inline-block; }
163
div.page-settings {
164
	font-size: 0.9em;
165
	border: none;
166
}
167
	div.page-settings div.caption {
168
		font-size: 1em;
169
		font-weight: bold;
170
		padding: 3px 0 0px 0;
171
		margin: 0; padding: 0; border: none;
172
		margin-bottom: 10px;
173
		border-bottom: groove 2px #a8bccb;
174
	}
175
	div.page-settings label {
176
		display: inline-block;
177
	}
165 178
	div.page-settings input,
166 179
	div.page-settings textarea,
167
	div.page-settings select { width: 210px; }
168
	div.page-settings textarea { height: 5em; }
169
	div.page-settings [type=checkbox] { width: 2.5em; }
170
div.page-settings-leftcol { float: left; padding: 0.4em 1em; }
171
	div.page-settings-leftcol div { padding: 2px 0 3px 0; vertical-align: top; }
172
	div.page-settings-leftcol label { width: 170px; vertical-align: top; }
173
div.page-settings-centercol { float: left; padding: 0.4em 1em;
174
	border-left: groove 2px #a8bccb; border-bottom: groove 2px #a8bccb; }
175
div.page-settings-rightcol { float: left; padding: 0.4em 1em;
176
	border-left: groove 2px #a8bccb; border-bottom: groove 2px #a8bccb; }
180
	div.page-settings select {
181
		width: 210px;
182
	}
183
	div.page-settings select {
184
/*		font-size: 1em; */
185
	}
186
	div.page-settings textarea {
187
		height: 5em;
188
	}
189
	div.page-settings [type=checkbox] {
190
		width: 2.5em;
191
	}
192
div.page-settings-leftcol {
193
	float: left;
194
	padding: 10px 10px 10px 10px;
195
	border-right: groove 2px #a8bccb;
196
}
197
	div.page-settings-leftcol div {
198
		padding: 2px 0 3px 0;
199
		vertical-align: top;
200
	}
201
	div.page-settings-leftcol label {
202
		width: 170px;
203
		vertical-align: top;
204
	}
205
div.page-settings-righttoprow {
206
	margin-left:417px;
207
	padding: 5px 20px 5px 10px;
208
}
209
	div.page-settings-righttoprow label {
210
		width: 110px;
211
		vertical-align: top;
212
	}
213
div.page-settings-centercol {
214
	float: left;
215
	padding: 10px 20px 10px 20px;
216
	border-right: groove 2px #a8bccb;
217
}
218
div.page-settings-rightcol {
219
	float: left;
220
	padding: 10px 20px 10px 10px;
221
	border: none;
222
}
223
/* ************************************************************************** */
224
/* DIV-mbox to show selector or simply content only ************************* */
225
div.mbox {
226
   padding :10px;
227
   margin :15px auto;
228
   background-color :#fff;
229
   color :#330033;
230
   font-size :1em;
231
   display :block;
232
}
233
 	div.mbox div { } /* inner div to expand for additional decorations (see .mbox-icon div) */
234
		div.mbox div a { font-size :1em; color: #0052A1; }
235
		div.mbox div a:hover { color: #0099FF; }
236
		div.mbox div p.title { margin :0; padding :0.08em 0 0.6em 0; font-size: 110%; color: #0052A1; font-weight: bold;}
237
		div.mbox div p { margin :0; padding :0 0 0.6em 0;}
238
div.mbox:hover {  }
239
/* extension for mbox to show additional icons on left side ***************** */
240
div.mbox-icon { background-repeat :no-repeat; background-image :url(icons/info_50.png); background-position :15px 50%; padding :15px; min-height: 25px;}
241
	div.mbox-icon div { margin-left :70px; border-left : 0px outset; padding-left: 5px;}
242
div.mbox-icon16 { background-repeat :no-repeat; background-image :url(icons/info_16.png); background-position :5px 50%; padding :5px; min-height: 10px;}
243
	div.mbox-icon16 div { margin-left :30px; border-left : 4px outset; padding-left: 5px;}
244
/* coloring of the mbox and other boxes also ******************************** */
245
div.box-ok { border-color: green; color: green; }
246
div.box-error { border-color: red; color: red; }
247
div.box-info { border-color: #bb7a00; color: #003ff2;}
248
div.box-warning { border-color: orange; color: orange;}
249
/* Border attributes for mbox and other elements also *********************** */
250

  
251
/* label/input attributes for mbox for tableless design *********************** */
252
div.mbox label, 
253
div.mbox select, 
254
div.mbox span, 
255
div.mbox textarea, 
256
div.mbox input { display :block; float :left; margin-bottom :10px; margin-right :5px; }
257
div.mbox label { padding-right :10px; }
258
div.mbox label.radio { text-align : left; padding-right :20px; width :100px; }
259
div.mbox br { clear : both; }
260
/**/
261
/* END of mbox - definition ************************************************* */
262
/* ************************************************************************** */
263
div.content_box form { width : 100%; }
264
.content_box {
265
   position :relative;
266
   margin :0px auto;
267
   padding :0;
268
}
269
   .content_box form{ background :transparent; height :auto; }
270
   .content_box li {
271
   float :left;
272
   margin :auto 0.8em;
273
   list-style-type :none;
274
   display :block;
275
}
276
   .content_box ul { padding :0 0 0 15px; margin :0 auto; width :100%; }
277
   .content_box h5.title { color :#339bff; font-weight :bold; font-size :1.2em; margin :0 auto; text-align :left; }
278
   .content_box h5.title a:link  { color :#0067ca; }
279
   .content_box h5.title a:hover  { color : #0099ff; }
280
   .content_box h5.noscript { font-size :1.2em; padding :5px 0px 5px 0px; }
281
   .content_box div.noscript { height :auto; width :100%; padding :5px; background :none no-repeat left; }
282
/*  */
283
   button { padding :2px; }
284
   button.link { padding :0px; background-color :transparent; display :inline; vertical-align :middle; border :0px none; cursor :pointer; }
285
   button span.title { font-size :1.3em; display :inline; font-weight :100; color :#007ac8; letter-spacing :1px; }
286
/*  */
287
.curved { border : 1px solid #666666; }
288
div.col_content { margin-right :0.5em; padding :2px 0 2px 10px; }
289
.shadow { box-shadow :3px 3px 10px rgba(0, 0, 0, 0.6); }
290
.row_0 { background-color :transparent; }
291
.row_1 { background-color : #cccccc; }
292
/**/
293
h1, h2, h3, h4, h5, h6 { color : #003366; display :block; font-weight :bold; margin :0.5em auto; padding-bottom :5px; }
294
h6 { font-size :100%; }
295
/**/
296
.cleft, div.col_left { float :left; }
297
.cright, div.col_right { float :right; }
298
.c25, div.col_width25 { width :25%; }
299
.c33, div.col_width33 { width :33.333%; }
300
.c50, div.col_width50 { width :48%; }
301
.c60, div.col_width60 { width :60%; }
302
.c75, div.col_width75 { width :75%; }
303
.c90, div.col_width90 { width :90%; }
304
.c100, div.col_width100 {
305
   width :100%;
306
   margin : 0 auto;
307
}
308
.c400, .col_width400 { width :400px; }
309
.h30 { height :25px; }
310
.h50 { height :49px; }
311
.h65 { min-height :70px; overflow :hidden; }
312
.h80 { height :80px; }
313
.h100 { height :100px; }
314
.h120 { height :120px; }
315
.h140 { height :140px; }
316
.h185 { height :185px; }
317
.min_h100 { min-height :100px; }
318
.border { border-right :5px solid #cccccc; }
319
/**/
320
.clear:after { clear :both; content :"."; display :block; font-size :0; height :0; visibility :hidden; }
321
.clear { clear :both; display :block; }
322
.ie-clearing { display :none; }
323
.floatbox { overflow :hidden; }
324
.spacer { line-height :1em; margin-right :0.5em; position :relative; }
325
table.layout { table-layout :fixed;  }
326
/*overwriting above */
327
td,th,textarea { color :#000000; font-size :96%; font-family :Verdana, Arial, Helvetica, sans-serif; }
328
textarea { font-size :86%; }
329
.container, .menu { 
330
   min-width :320px;
331
 }
332
.content {
333
  padding: 1em;
334
  width: 85%;
335
  min-width :320px;
336
}
337
div.dev-info {
338
   background :#DDDDDD;
339
   max-width: 85%;
340
   min-height :2em;
341
   height :auto;
342
   white-space :normal;
343
   margin : 0 auto 10px;
344
   position :relative;
345

  
346
}
347
.settings_table, .tool_table {
348
   text-align :left;
349
   vertical-align :top;
350
}
351

  
352
input.save,
353
input.reset { 
354
width:40%;
355
 }
356
.msg-box { text-align :left; }
357

  
358
.permission_box { 
359
   width :95%;
360
   border :2px solid #ddd;
361
 }
362
.permission_box caption { 
363
   text-align : center;
364
   line-height : 30px;
365
   font-weight :bold;
366
 }
367
.permission_box th { 
368
   text-align :left;
369
   background :#d2e8e8;
370
 }
371
.permission_box th { 
372
   text-align :left;
373
 }
374
.permission_box td label { 
375
   text-align :left;
376
   vertical-align : text-top;
377
   font-size :98%;
378
 }
379
textarea { font-size :100%; }
380

  
381
.setting_value label { 
382
   text-align :left;
383
   vertical-align : text-top;
384
   font-size :98%;
385
 }
386
.menu {
387
   margin :0;
388
   padding :0;
389
   padding-top :8px;
390
   padding-bottom :10px;
391
   padding-left :8px;
392
   background : #000000 url(images/menu.png);
393
}
394
.menu li { padding-right :1px; list-style-type :none; display :inline; }
395
.menu a, .menu a:link, .menu a:active, .menu a:visited {
396
   border-bottom :0;
397
   padding :10px 11px;
398
   color :#ffffff;
399
}
400

  
401
/* header horizontal navigation */  
402
div.menu {
403
   background : #486991 url(images/menu.png);
404
   hei/ght : 3em;
405
   line-height : 3.0em;
406
   margin : 2px auto;
407
   padding :0;
408
   font-size :96%;
409
   text-align :left;
410
   width :100%;
411
}
412
   div.menu ul {
413
   color :#ffffff;
414
   display :block;
415
   padding :0;
416
   list-style-position :outside;
417
}
418
	   div.menu * a { color :#ffffff; text-decoration :none; }	
419
   div.menu ul li {
420
   color :#ffffff;
421
   display :inline;
422
   padding :10px 0px;
423
}
424
   div.menu ul li a {
425
   color :#ffff33;
426
   display :inline;
427
   padding :15px 5px;
428
   font-weight :normal;
429
} 
430
   div.menu ul li a.active {
431
   color :#ffffff;
432
   padding :9px 11px 9px 11px;
433
   background : #94dd00 url(images/menuo.png) no-repeat;
434
}
435
   div.menu ul li:hover,
436
   div.menu ul li a:hover {
437
   color :#ffffff;
438
   background : #486991 url(images/menuo.png) repeat-x;
439
} 
440
.main { 
441
   width :auto;
442
   min-/width :320px;
443
   max-width :87em;
444
   border :0px solid #000000;
445
   margin : 0px auto;
446
   padding :0px;
447
 }
448

  
449
.header { 
450
   width :85%;
451
 }   
452
 .footer { 
453
    width :85%;
454
   margin : 15px auto;
455
  }
456
.logo { 
457
   width :278px;
458
   padding-right :20px;
459
 }  
460
.version { 
461
    margin : 15px auto;
462
  float :right;
463
 }   
464
 .topnav { 
465
    margin : 0 auto;
466
    text-align :center;
467
 }   
468
 div.msg-box.center { 
469
    margin : 0 auto;
470
    text-align :center;
471
 }   
472
.pages_list table td, table.pages_view td {
473
   padding :3px;
474
   font-size :150%;
475
}
branches/2.8.x/wb/templates/wb_theme/templates/header.htt
10 10
<meta name="author" content="WebsiteBaker Org e.V." />
11 11
<meta http-equiv="Content-Encoding" content="gzip" />
12 12
<meta http-equiv="Accept-Encoding" content="gzip, deflate" />
13
<link href="{THEME_URL}/normalize.css" rel="stylesheet" type="text/css" />
13 14
<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
14 15
{BACKEND_MODULE_CSS}
15 16
<script type="text/javascript">
......
31 32
</script>
32 33
</head>
33 34
<body>
34
<table summary="" class="header">
35
<div class="main">
36

  
37
<table summary="" class="header layout">
35 38
<tr>
36
	<td>
39
	<td class="logo">
37 40
		<a href="{ADMIN_URL}" title="{TITLE_START}"><img src="{THEME_URL}/images/logo.png" border="0" alt="Logo" /></a>
38 41
	</td>
39
	<td>&nbsp;</td>
40
	<td class="menue">
42
	<td class="topnav">
41 43
         <a href="{ADMIN_URL}" title="{TITLE_START}"><img src="{THEME_URL}/images/home.png" border="0" alt="{TITLE_START}" /></a>
42 44
         &nbsp;&nbsp;<a href="{URL_VIEW}" target="_blank" title="{TITLE_VIEW}"><img src="{THEME_URL}/images/view.png" border="0" alt="{WB_URL}" /></a>
43 45
	&nbsp; <a href="{URL_HELP}" target="_blank" title="{TITLE_HELP}"><img src="{THEME_URL}/images/help.png" border="0" alt="{TITLE_HELP}" /></a>
......
53 55
<table summary="" class="container">
54 56
<tr>
55 57
	<td>
56
		<ul class="menu">
58
		<div class="menu">
59
			<ul>
57 60
			<!-- BEGIN linkBlock -->
58 61
			<li class="{CLASS}"><a href="{LINK}" target="{TARGET}">{TITLE}</a></li>
59 62
			<!-- END linkBlock -->
60 63
		</ul>
64
		</div>
61 65
	</td>
62 66
</tr>
63 67
<tr>
branches/2.8.x/wb/templates/wb_theme/templates/footer.htt
3 3
</tr>
4 4
</table>
5 5

  
6
<table summary="" cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0px 10px 0px;">
6
<table class="footer" summary="" cellpadding="0" cellspacing="0" border="0">
7 7
<tr>
8 8
	<td style="font-size: 12px; text-align:center;">
9 9
      <!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
......
14 14
</tr>
15 15
</table>
16 16
<!-- BEGIN show_debug_block -->
17
<div style="position: relative; width:998px;margin:15px auto;" class="shadow">
18
	<div style="padding:10px;left:0; margin-bottom:25px; z-index:10; background-color:#dddddd;color:#dd0000;">
19
		Memory Limit: {FILESIZE}&nbsp;|&nbsp;
20
		Used Memory: {MEMORY}&nbsp;|&nbsp;
17
<div class="mbox dev-info">
18
	<div style="text-align:left; width: auto;">
19
		<span class="">Memory Limit: {FILESIZE}&nbsp;|&nbsp;</span>
20
		<span class="">Used Memory: {MEMORY}&nbsp;|&nbsp;</span>
21 21
		<span class="">SQL-Queries executed: {QUERIES}&nbsp;|&nbsp;</span>
22
		Included&nbsp;{INCLUDES}&nbsp;files &nbsp;|&nbsp;{TXT_SUM_FILESIZE}{SUM_FILESIZE}
22
		<span class="">Summary size of {INCLUDES} included files: {SUM_FILESIZE}</span>
23 23
	<!-- BEGIN show_block_list -->
24 24
		<ul style="margin-left: 27px; margin-top: 0;">
25 25
		<!-- BEGIN include_block_list -->
......
30 30
	</div>
31 31
</div>
32 32
<!-- END show_debug_block -->
33
</div>
33 34
{BACKEND_BODY_MODULE_JS}
34 35
</body>
35 36
</html>

Also available in: Unified diff