Project

General

Profile

« Previous | Next » 

Revision 1235

Added by Dietmar over 14 years ago

Ticket #903 fix CSS-errors in WB backend
add title class in show_breadcrumbs, now full css styling

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
------------------------------------- 2.8.1 -------------------------------------
14
10-Jan-2010 Dietmar Woellbrink (Luisehahne)
15
!	Ticket #903 fix CSS-errors in WB backend
16
!	add title class in show_breadcrumbs, now full css styling
14 17
05-Jan-2010 Dietmar Woellbrink (Luisehahne)
15 18
!	recoded function show_breadcrumbs
16 19
30-Dec-2009 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/interface/version.php
2 2
/****************************************************************************
3 3
* SVN Version information:
4 4
*
5
* $Id: version.php 1230 2009-12-28 23:34:48Z Luisehahne $
5
* $Id: version.php 1233 2009-12-28 23:34:48Z Luisehahne $
6 6
*
7 7
*
8 8
*
......
56 56
 * @author       Ryan Djurovich
57 57
 * @copyright    2004-2009, Ryan Djurovich
58 58
 * @copyright    2009-2010, Website Baker Org. e.V.
59
 * @version      $Id: version.php 1230 2009-12-28 23:34:48Z Luisehahne $
59
 * @version      $Id: version.php 1233 2009-12-28 23:34:48Z Luisehahne $
60 60
 * @platform     WebsiteBaker 2.8.x
61 61
 * @requirements >= PHP 4.3.4
62 62
 * @license      http://www.gnu.org/licenses/gpl.html
......
70 70

  
71 71
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
72 72
if(!defined('VERSION')) define('VERSION', '2.8.1');
73
if(!defined('REVISION')) define('REVISION', '1233');
73
if(!defined('REVISION')) define('REVISION', '1235');
74 74

  
75 75
?>
branches/2.8.x/wb/framework/class.login.php
1 1
<?php
2
/****************************************************************************
3
* SVN Version information:
4
*
5
* $Id$
6
*
7
*
8
*
9
*****************************************************************************
10
*                          WebsiteBaker
11
*
12
* WebsiteBaker Project <http://www.websitebaker2.org/>
13
* Copyright (C) 2009, Website Baker Org. e.V.
14
*         http://start.websitebaker2.org/impressum-datenschutz.php
15
* Copyright (C) 2004-2009, Ryan Djurovich
16
*
17
*                        About WebsiteBaker
18
*
19
* Website Baker is a PHP-based Content Management System (CMS)
20
* designed with one goal in mind: to enable its users to produce websites
21
* with ease.
22
*
23
*****************************************************************************
24
*
25
*****************************************************************************
26
*                        LICENSE INFORMATION
27
*
28
* WebsiteBaker is free software; you can redistribute it and/or
29
* modify it under the terms of the GNU General Public License
30
* as published by the Free Software Foundation; either version 2
31
* of the License, or (at your option) any later version.
32
*
33
* WebsiteBaker is distributed in the hope that it will be useful,
34
* but WITHOUT ANY WARRANTY; without even the implied warranty of
35
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
36
* See the GNU General Public License for more details.
37
*
38
* You should have received a copy of the GNU General Public License
39
* along with this program; if not, write to the Free Software
40
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
41
****************************************************************************
42
*
43
*                   WebsiteBaker Extra Information
44
*
45
* This class will be used to with the login application
46
*
47
*
48
*
49
*
50
*
51
*****************************************************************************/
52
/**
53
 *
54
 * @category     backend
55
 * @package      login
56
 * @author       Ryan Djurovich
57
 * @copyright    2004-2009, Ryan Djurovich
58
 * @copyright    2009-2010, Website Baker Org. e.V.
59
 * @version      $Id$
60
 * @platform     WebsiteBaker 2.8.x
61
 * @requirements >= PHP 4.3.4
62
 * @license      http://www.gnu.org/licenses/gpl.html
63
 *
64
 */
2 65

  
3
// $Id$
4

  
5
/*
6

  
7
 Website Baker Project <http://www.websitebaker.org/>
8
 Copyright (C) 2004-2009, 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
/*
27
 * @category   backend
28
 * @package    Login class
29
 * @author(s)  Dietmar W?llbrink <Luisehahne>, Dietrich Roland Pehlke <Aldus>
30
 * @platform   WB 2.8.x
31
 * @require    PHP 5.2.11
32
 * @license    http://www.gnu.org/licenses/gpl.html
33
 * @link       http://project.websitebaker2.org/browser/branches/2.8.x/wb/pages
34
 * @changeset  2009/11/27   fixed parse error ticket #878
35

  
36

  
37

  
38
This class will be used to with the login application
39

  
40
*/
41

  
42 66
// Stop this file from being accessed directly
43 67
if(!defined('WB_URL')) {
44 68
	header('Location: ../index.php');
......
379 403
			$template->set_file('page', $this->template_file);
380 404
			$template->set_block('page', 'mainBlock', 'main');
381 405
			if($this->remember_me_option != true) {
382
				$template->set_var('DISPLAY_REMEMBER_ME', 'none');
406
				$template->set_var('DISPLAY_REMEMBER_ME', 'display: none;');
383 407
			} else {
384 408
				$template->set_var('DISPLAY_REMEMBER_ME', '');
385 409
			}
branches/2.8.x/wb/framework/frontend.functions.php
231 231
		global $database;
232 232
		global $wb;
233 233
		$admin = & $wb;
234
		if ($wb->page_access_denied==true) {
234
		if ($wb->page_access_denied==true)
235
        {
235 236
	        echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'];
236 237
			exit();
237 238
		}
238
		if ($wb->page_no_active_sections==true) {
239
		if ($wb->page_no_active_sections==true)
240
        {
239 241
	        echo $MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'];
240 242
			exit();
241 243
		}
242
		if(isset($globals) AND is_array($globals)) { foreach($globals AS $global_name) { global $$global_name; } }
244
		if(isset($globals) AND is_array($globals))
245
        {
246
            foreach($globals AS $global_name)
247
            {
248
                global $$global_name;
249
                }
250
        }
243 251
		// Make sure block is numeric
244 252
		if(!is_numeric($block)) { $block = 1; }
245 253
		// Include page content
......
303 311
					echo $content;
304 312
				}
305 313
			}
306
		} else {
314
		}
315
        else
316
        {
317

  
307 318
			require(PAGE_CONTENT);
308 319
		}
309 320
	}
......
333 344
            $level = ($count <= $level ) ? $count-1 : $level;
334 345
            // set level from which to show, delete indexes in array
335 346
			$crumbs = array_slice($bread_crumbs, $level );
336
            // set depth of links -1 or 0 show all links
337 347
            $depth = ($depth <= 0) ? sizeof($crumbs) : $depth;
338 348
            // if empty array, set orginal links
339 349
            $crumbs = (!empty($crumbs)) ?  $crumbs : $wb->page_trail;
340 350
            $total_crumbs = ( ($depth <= 0) OR ($depth > sizeof($crumbs)) ) ? sizeof($crumbs) : $depth;
341
            print '<div class="breadcrumb">'.$title;
342

  
343
			foreach ($crumbs as $temp){
351
            print '<div class="breadcrumb"><span class=" title">'.$title.'</span>';
352
          //  print_r($crumbs);
353
			foreach ($crumbs as $temp)
354
            {
344 355
                if($counter == $depth) { break; }
345
                    // set separator
346
					$query_menu = $database->query("SELECT menu_title, link FROM ".TABLE_PREFIX."pages WHERE page_id = $temp");
356
                    // set links and separator
357
					$query_menu = $database->query("SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = $temp");
347 358
					$page = $query_menu->fetchRow();
348
					if ( ($links == true) AND ($temp != $page_id) ) {
349
						print '<a href="'.page_link($page['link']).'">'.$page['menu_title'].'</a>';
350
					} else {
351
                        print '<span class="crumb">'.$page['menu_title'].'</span>';
352
					}
353
                    if ( ( $counter <> $total_crumbs-1 ) ) {
359

  
360
                    $show_crumb = (($links == true) AND ($temp != $page_id))
361
                            ? '<a href="'.page_link($page['link']).'" class="link">'.$page['menu_title'].'</a>'
362
                            : '<span class="crumb">'.MENU_TITLE.'</span>';
363

  
364
                    // Permission
365
                    switch ($page['visibility'])
366
                    {
367
                        case 'none' :
368
                        case 'hidden' :
369
                        // if show, you know there is an error in a hidden page
370
                            print $show_crumb.' --- ';
371
                        break;
372
                        default :
373
                            print $show_crumb;
374
                        break;
375
                    }
376

  
377
                    if ( ( $counter <> $total_crumbs-1 ) )
378
                    {
354 379
                        print '<span class="separator">'.$sep.'</span>';
355 380
                    }
356 381
	            $counter++;
357
                }
382
            }
358 383
            print "</div>\n";
359 384
		}
360 385
	}
branches/2.8.x/wb/templates/wb_theme/templates/login.htt
46 46
			<td width="170" height="30" align="right">{TEXT_PASSWORD}:</td>
47 47
			<td><input type="password" maxlength="{MAX_PASSWORD_LEN}" name="{PASSWORD_FIELDNAME}" style="width: 180px;" /></td>
48 48
		</tr>
49
		<tr style="display: {DISPLAY_REMEMBER_ME};">
49
		<tr style="{DISPLAY_REMEMBER_ME}">
50 50
			<td>&nbsp;</td>
51 51
			<td>
52 52
				<input type="checkbox" name="remember" id="remember" value="true" />
branches/2.8.x/wb/templates/argos_theme/templates/login.htt
1
<!-- BEGIN mainBlock -->
2
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4
<head>
5
<title>{TEXT_LOGIN}</title>
6
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
7
<meta http-equiv="content-language" content="{LANGUAGE}" />
8
<meta name="description" content="{TEXT_LOGIN}" />
9
<meta name="keywords" content="{TEXT_LOGIN}" />
10
<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
11
</head>
12
<body onload="document.login.{USERNAME_FIELDNAME}.focus();">
13
<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
14
	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
15
	{TEXT_LOGIN}
16
</div> 
17
<table cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
18
  <tr>
19
    <td class="content">
20
      <form name="login" action="{ACTION_URL}" method="post">
21
        <input type="hidden" name="url" value="{URL}" />
22
        <input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
23
        <input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
24
        <table cellpadding="5" cellspacing="0" border="0" align="center" width="500">
25
          <tr>
26
            <td height="40" align="center" colspan="2">{MESSAGE}</td>
27
          </tr>
28
          <tr>
29
            <td height="10" colspan="2"></td>
30
          </tr>
31
          <tr>
32
            <td width="170" height="30" align="right">{TEXT_USERNAME}:</td>
33
            <td>
34
              <input type="text" maxlength="{MAX_USERNAME_LEN}" name="{USERNAME_FIELDNAME}" value="{USERNAME}" style="width: 180px;" />
35
            </td>
36
          </tr>
37
          <tr>
38
            <td width="170" height="30" align="right">{TEXT_PASSWORD}:</td>
39
            <td>
40
              <input type="password" maxlength="{MAX_PASSWORD_LEN}" name="{PASSWORD_FIELDNAME}" style="width: 180px;" />
41
            </td>
42
          </tr>
43
          <tr style="display: {DISPLAY_REMEMBER_ME};">
44
            <td>&nbsp;</td>
45
            <td>
46
              <input type="checkbox" name="remember" id="remember" value="true" />
47
              <label for="remember">{TEXT_REMEMBER_ME}</label>
48
            </td>
49
          </tr>
50
          <tr>
51
            <td>&nbsp;</td>
52
            <td>
53
              <input type="submit" name="submit" value="{TEXT_LOGIN}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" />
54
            </td>
55
          </tr>
56
          <tr>
57
            <td height="10" colspan="2"></td>
58
          </tr>
59
        </table>
60
      </form>
61
      <center>
62
        <a href="{FORGOTTEN_DETAILS_APP}">{TEXT_FORGOTTEN_DETAILS}</a> 
63
		<br />
64
        <br />
65
        <br />
66
        <a href="{WB_URL}">{TEXT_HOME}</a>
67
      </center>
68
    </td>
69
  </tr>
70
</table>
71
<table cellpadding="0" cellspacing="0" border="0" width="100%" style="padding:10px 0;">
72
  <tr>
73
    <td style="font-size:10px;text-aslign:center;">
74
      <!-- 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. -->
75
      <a href="http://www.websitebaker.com/" style="color: #000000;" target="_blank">Website Baker</a> is	released under the <a href="http://www.gnu.org/copyleft/gpl.html" style="color: #000000;" target="_blank">GNU General Public License</a>
76
      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
77
    </td>
78
  </tr>
79
</table>
80
</body>
81
</html>
82
<!-- END mainBlock -->
1
<!-- BEGIN mainBlock -->
2
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4
<head>
5
<title>{TEXT_LOGIN}</title>
6
<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
7
<meta http-equiv="content-language" content="{LANGUAGE}" />
8
<meta name="description" content="{TEXT_LOGIN}" />
9
<meta name="keywords" content="{TEXT_LOGIN}" />
10
<link href="{THEME_URL}/theme.css" rel="stylesheet" type="text/css" />
11
</head>
12
<body onload="document.login.{USERNAME_FIELDNAME}.focus();">
13
<div style="text-align:left;font-size:20px;color:#fff;padding:15px 0 0 50px;height:100px;">
14
	<!-- <img src="{THEME_URL}/images/logo.png" alt="Logo" /> -->
15
	{TEXT_LOGIN}
16
</div> 
17
<table cellpadding="0" cellspacing="0" border="0" width="770" align="center" style="margin-top: 30px;">
18
  <tr>
19
    <td class="content">
20
      <form name="login" action="{ACTION_URL}" method="post">
21
        <input type="hidden" name="url" value="{URL}" />
22
        <input type="hidden" name="username_fieldname" value="{USERNAME_FIELDNAME}" />
23
        <input type="hidden" name="password_fieldname" value="{PASSWORD_FIELDNAME}" />
24
        <table cellpadding="5" cellspacing="0" border="0" align="center" width="500">
25
          <tr>
26
            <td height="40" align="center" colspan="2">{MESSAGE}</td>
27
          </tr>
28
          <tr>
29
            <td height="10" colspan="2"></td>
30
          </tr>
31
          <tr>
32
            <td width="170" height="30" align="right">{TEXT_USERNAME}:</td>
33
            <td>
34
              <input type="text" maxlength="{MAX_USERNAME_LEN}" name="{USERNAME_FIELDNAME}" value="{USERNAME}" style="width: 180px;" />
35
            </td>
36
          </tr>
37
          <tr>
38
            <td width="170" height="30" align="right">{TEXT_PASSWORD}:</td>
39
            <td>
40
              <input type="password" maxlength="{MAX_PASSWORD_LEN}" name="{PASSWORD_FIELDNAME}" style="width: 180px;" />
41
            </td>
42
          </tr>
43
          <tr style="{DISPLAY_REMEMBER_ME}">
44
            <td>&nbsp;</td>
45
            <td>
46
              <input type="checkbox" name="remember" id="remember" value="true" />
47
              <label for="remember">{TEXT_REMEMBER_ME}</label>
48
            </td>
49
          </tr>
50
          <tr>
51
            <td>&nbsp;</td>
52
            <td>
53
              <input type="submit" name="submit" value="{TEXT_LOGIN}" style="width: 180px; font-size: 10px; text-transform: uppercase; color: #003366; border: 1px solid #336699; background-color: #DDDDDD; padding: 3px;" />
54
            </td>
55
          </tr>
56
          <tr>
57
            <td height="10" colspan="2"></td>
58
          </tr>
59
        </table>
60
      </form>
61
      <center>
62
        <a href="{FORGOTTEN_DETAILS_APP}">{TEXT_FORGOTTEN_DETAILS}</a> 
63
		<br />
64
        <br />
65
        <br />
66
        <a href="{WB_URL}">{TEXT_HOME}</a>
67
      </center>
68
    </td>
69
  </tr>
70
</table>
71
<table cellpadding="0" cellspacing="0" border="0" width="100%" style="padding:10px 0;">
72
  <tr>
73
    <td style="font-size:10px;text-aslign:center;">
74
      <!-- 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. -->
75
      <a href="http://www.websitebaker.com/" style="color: #000000;" target="_blank">Website Baker</a> is	released under the <a href="http://www.gnu.org/copyleft/gpl.html" style="color: #000000;" target="_blank">GNU General Public License</a>
76
      <!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
77
    </td>
78
  </tr>
79
</table>
80
</body>
81
</html>
82
<!-- END mainBlock -->
branches/2.8.x/wb/modules/jsadmin/backend.css
21 21

  
22 22
.jsadmin_drag a, .jsadmin_drag input, .jsadmin_drag select {
23 23
	cursor: pointer;
24
	cursor: hand;
25 24
}
26 25

  
27 26
ul.jsadmin_drag_area {

Also available in: Unified diff