Project

General

Profile

« Previous | Next » 

Revision 691

Added by doc almost 17 years ago

Website Header field in Settings now visible per default; Modified templates to display Website Header and to use show_menu instead of page_menu.

View differences:

trunk/CHANGELOG
10 10
# = Bugfix
11 11
! = Update/Change
12 12

  
13
------------------------------------- 2.7.0 -------------------------------------
14
10-Feb-2008 Thomas Hornik
13
------------------------------------- 2.7.0 -------------------------------------

14
10-Feb-2008 Thomas Hornik

15 15
#	CAPTCHA: Wrong text for calc_ttf-captcha. 
16 16
10-Feb-2008 Christian Sommer
17
!	made Website Header field in Settings visible per default
18
!	modified all templates (display Website Header, use show_menu instead of page_menu)
17 19
!	added highlighting of active input elements to all WB backend areas; changed some colors
18 20
!	removed hover highlighting of input fields to avoid possible confusion
19 21
!	added visualization of wrong/empty input fields
trunk/wb/admin/settings/save.php
24 24
*/
25 25

  
26 26
// prevent this file from being accessed directly in the browser (would set all entries in DB settings table to '')
27
if(!isset($_POST['default_language']) || $_POST['default_language'] == '') die("Cannot access this file directly");  
27
if(!isset($_POST['default_language']) || $_POST['default_language'] == '') die(header('Location: index.php'));  
28 28

  
29 29
// Find out if the user was view advanced options or not
30 30
if($_POST['advanced'] == 'yes' ? $advanced = '?advanced=yes' : $advanced = '');
trunk/wb/admin/settings/template.html
110 110
		<textarea name="website_keywords">{WEBSITE_KEYWORDS}</textarea>
111 111
	</td>
112 112
</tr>
113
<tr class="advanced">
113
<tr>
114 114
	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
115 115
	<td class="setting_value" colspan="2">
116 116
		<textarea name="website_header">{WEBSITE_HEADER}</textarea>
trunk/wb/templates/allcss/screen.css
97 97
	display: block;
98 98
	padding: 2px;
99 99
}
100
.menu_main a:link, .menu_main a:visited, .menu_main a:active {
100
.menu_default a:link, .menu_default a:visited, .menu_default a:active {
101 101
	border-bottom: 1px dashed #999999;
102 102
}
103
.menu_main a:hover {
103
.menu_default a:hover {
104 104
	border-bottom: 1px dashed #333333;
105 105
}
106

  
107
.menu_current  {
108
	border-bottom: 1px dashed #999999;
109
	font-weight:bold;
110
}
111

  
106 112
.login_table {
107 113
	border: 1px solid #D0D0D0;
108 114
	margin-top: 20px;
trunk/wb/templates/allcss/index.php
39 39
<link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
40 40
<link href="<?php echo TEMPLATE_DIR; ?>/print.css" rel="stylesheet" type="text/css" media="print" />
41 41
<?php
42
// this allows to include the optional module files (frontend.css, frontend.js) into the head section
42 43
if(function_exists('register_frontend_modfiles')) {
43 44
  register_frontend_modfiles('css');
44 45
  register_frontend_modfiles('js');
45 46
} ?>
47
<?php 
48
// this allows to add custom information to the head section of your template (WB-->Settings-->Website Header)
49
echo WEBSITE_HEADER; 
50
?>
46 51
</head>
47 52
<body>
48 53

  
......
67 72
	if(SHOW_MENU) {
68 73
	?>	
69 74
	<div class="menu">
70
		<?php page_menu(0, 1, '<li class="menu_main"[class]>[a] [menu_title] [/a]</li>', '<ul>', '</ul>', '', ' style="font-weight: bold;"'); ?>
75
		<?php 
76
		show_menu();
71 77
		
72
		<?php
73 78
		if(FRONTEND_LOGIN == 'enabled' AND VISIBILITY != 'private' AND $wb->get_session('USER_ID') == '') {
74 79
		?>
75 80
		<form name="login" action="<?php echo LOGIN_URL; ?>" method="post" class="login_table">
trunk/wb/templates/blank/screen.css
1
* { padding: 0; margin: 0; }
2

  
3
body {
4
  color: #444; 
5
  font-size: 81.25%; 
6
  font-family: 'Trebuchet MS', Verdana, Arial, Helvetica, Sans-Serif;
7
  margin-left: 1em;
8
  margin-top: 1em;
9
}
10

  
11
ul { margin-left: 1em; }
trunk/wb/templates/blank/index.php
1
<?php
2

  
3
// $Id$
4

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2008, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26
if(!defined('WB_URL')) {
27
	header('Location: ../index.php');
28
	exit(0);
29
}
30

  
31
page_content();
32

  
33
?>
1
<?php
2

  
3
// $Id$
4

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2008, Ryan Djurovich
9

  
10
 Website Baker is free software; you can redistribute it and/or modify
11
 it under the terms of the GNU General Public License as published by
12
 the Free Software Foundation; either version 2 of the License, or
13
 (at your option) any later version.
14

  
15
 Website Baker is distributed in the hope that it will be useful,
16
 but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 GNU General Public License for more details.
19

  
20
 You should have received a copy of the GNU General Public License
21
 along with Website Baker; if not, write to the Free Software
22
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
23

  
24
*/
25

  
26
if(!defined('WB_URL')) {
27
	header('Location: ../index.php');
28
	exit(0);
29
}
30

  
31
?>
32
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
33
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
34
<head>
35
<title><?php page_title(); ?></title>
36
<meta http-equiv="Content-Type" content="text/html; charset=<?php if(defined('DEFAULT_CHARSET')) { echo DEFAULT_CHARSET; } else { echo 'utf-8'; }?>" />
37
<meta name="description" content="<?php page_description(); ?>" />
38
<meta name="keywords" content="<?php page_keywords(); ?>" />
39
<link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
40
<?php
41
// this allows to include the optional module files (frontend.css, frontend.js) into the head section
42
if(function_exists('register_frontend_modfiles')) {
43
  register_frontend_modfiles('css');
44
  register_frontend_modfiles('js');
45
} ?>
46
<?php 
47
// this allows to add custom information to the head section of your template (WB-->Settings-->Website Header)
48
echo WEBSITE_HEADER; 
49
?>
50
</head>
51

  
52

  
53
<body>
54
<?php 
55
	// display menu
56
	show_menu();
57
	
58
	// display page content
59
	page_content(); 
60
	
61
	// display website footer
62
	page_footer();
63
?>
64
</body>
65
</html>
trunk/wb/templates/round/index.php
39 39
<link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
40 40
<link href="<?php echo TEMPLATE_DIR; ?>/print.css" rel="stylesheet" type="text/css" media="print" />
41 41
<?php
42
// this allows to include the optional module files (frontend.css, frontend.js) into the head section
42 43
if(function_exists('register_frontend_modfiles')) {
43 44
  register_frontend_modfiles('css');
44 45
  register_frontend_modfiles('js');
45 46
} ?>
47
<?php 
48
// this allows to add custom information to the head section of your template (WB-->Settings-->Website Header)
49
echo WEBSITE_HEADER; 
50
?>
46 51
</head>
47 52
<body>
48 53

  
......
66 71
		</tr>
67 72
		<tr>
68 73
			<td width="170">
69
				<?php page_menu(); ?>
74
				<?php show_menu(); ?>
70 75
			</td>
71 76
		</tr>
72 77
		<tr>
trunk/wb/templates/simple/screen.css
43 43
	padding: 0;
44 44
	padding-left: 5px;
45 45
}
46
.current {
46
.menu_current {
47 47
	font-weight: bold;
48 48
}
49 49
.highlight {
trunk/wb/templates/simple/index.php
39 39
<link href="<?php echo TEMPLATE_DIR; ?>/screen.css" rel="stylesheet" type="text/css" media="screen" />
40 40
<link href="<?php echo TEMPLATE_DIR; ?>/print.css" rel="stylesheet" type="text/css" media="print" />
41 41
<?php
42
// this allows to include the optional module files (frontend.css, frontend.js) into the head section
42 43
if(function_exists('register_frontend_modfiles')) {
43 44
  register_frontend_modfiles('css');
44 45
  register_frontend_modfiles('js');
45 46
} ?>
47
<?php 
48
// this allows to add custom information to the head section of your template (WB-->Settings-->Website Header)
49
echo WEBSITE_HEADER; 
50
?>
46 51
</head>
47 52
<body>
48 53

  
......
61 66
	<td class="menu">
62 67
		<?php if(SHOW_MENU) { /* Only shown menu if we need to */ ?>	
63 68
			Menu: <br />
64
			<?php page_menu(); ?>
69
			<?php show_menu(); ?>
65 70
		<?php } ?>
66 71
		
67 72
		<?php if(SHOW_SEARCH) { /* Only show search box if search is enabled */ ?>

Also available in: Unified diff