aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-11-04 01:47:48 +0000
committerrvelices <rv-github@modusoptimus.com>2008-11-04 01:47:48 +0000
commitad2941220f67f425d83f7922da1a6e09f8d7f170 (patch)
tree6b69fcf4f2f679ffbb399f92707a6bce8de1a202
parent00beb5d3ad932d5c767906755d1ccad107c38f8f (diff)
merge -c2823 from branch 2.0 to trunk
- removed some unused constants from constants.php - removed some unused css rules - removed unused code git-svn-id: http://piwigo.org/svn/trunk@2824 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/common.inc.php12
-rw-r--r--include/constants.php8
-rw-r--r--include/functions_user.inc.php15
-rw-r--r--template/yoga/default-layout.css16
-rw-r--r--template/yoga/picture.css12
-rw-r--r--template/yoga/theme/dark/theme.css2
6 files changed, 13 insertions, 52 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 0b1a2b581..d31aefbb6 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -143,21 +143,15 @@ if (is_a_guest())
}
// template instance
-if
- (
- defined('IN_ADMIN') and IN_ADMIN
- )
-{
- // Admin template
- //$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['admin_template'], $user['admin_theme'] );
+if ( defined('IN_ADMIN') and IN_ADMIN )
+{// Admin template
list($user['admin_template'], $user['admin_theme']) =
explode ('/', $conf['admin_layout']);
$template = new Template(PHPWG_ROOT_PATH.'admin/template/'
. $user['admin_template'], $user['admin_theme'] );
}
else
-{
- // Classic template
+{ // Classic template
$template = new Template(PHPWG_ROOT_PATH.'template/'
. $user['template'], $user['theme'] );
}
diff --git a/include/constants.php b/include/constants.php
index dbed84511..88c00b6c5 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -33,12 +33,6 @@ define('PHPWG_DEFAULT_TEMPLATE', 'yoga/Sylvia');
define('REQUIRED_PHP_VERSION', '5.0.0');
define('REQUIRED_MYSQL_VERSION', '4.1.22');
-// Error codes
-define('GENERAL_MESSAGE', 200);
-define('GENERAL_ERROR', 202);
-define('CRITICAL_MESSAGE', 203);
-define('CRITICAL_ERROR', 204);
-
// Access codes
define('ACCESS_FREE', 0);
define('ACCESS_GUEST', 1);
@@ -107,4 +101,4 @@ if (!defined('PLUGINS_TABLE'))
if (!defined('OLD_PERMALINKS_TABLE'))
define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks');
-?>
+?> \ No newline at end of file
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 074a8aae9..7681e49cd 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -211,12 +211,6 @@ function build_user( $user_id, $use_cache )
// calculation of the number of picture to display per page
$user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
- if (is_admin($user['status']))
- {
- list($user['admin_template'], $user['admin_theme']) =
- explode ('/', $conf['admin_layout']);
- }
-
list($user['template'], $user['theme']) = explode('/', $user['template']);
return $user;
@@ -1373,14 +1367,7 @@ function get_sql_condition_FandF(
}
else
{
- if ($force_one_condition)
- {
- $sql = '1 = 1';
- }
- else
- {
- $sql = '';
- }
+ $sql = $force_one_condition ? '1 = 1' : '';
}
if (isset($prefix_condition) and !empty($sql))
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 58310623e..55cd09e57 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -46,7 +46,6 @@ HR.separation {
margin: 0 0 10px 0;
}
-/** General defaults **/
INPUT, SELECT {
margin: 0;
font-size: 1em; /* <= some browsers don't set it correctly */
@@ -57,7 +56,6 @@ TABLE { /* horizontaly centered */
margin-right: auto;
}
-/** forms **/
FORM { padding: 0; margin: 0; }
@@ -72,12 +70,6 @@ FORM FIELDSET P {
margin-bottom: 0;
}
-TEXTAREA.description {
- height: 6em;
- width: 40em;
- overflow: auto;
-}
-
SELECT.categoryList {
height: 20em;
width: 500px;
@@ -274,10 +266,10 @@ TABLE.tagLetterContent {
#theHeader {text-align: center;}
-#theNotificationPage dl,
-#thePopuphelpPage dl { margin: 0 25px 25px; }
-#content #comments ul.thumbnailCategories li { width:99%; }
+#theNotificationPage DL,
+#thePopuphelpPage DL { margin: 0 25px 25px; }
+#content #comments UL.thumbnailCategories LI { width:99%; }
/* jQuery datepicker */
-img.ui-datepicker-trigger {
+IMG.ui-datepicker-trigger {
cursor : pointer;
}
diff --git a/template/yoga/picture.css b/template/yoga/picture.css
index bd512e34a..7f0f55e86 100644
--- a/template/yoga/picture.css
+++ b/template/yoga/picture.css
@@ -55,18 +55,12 @@
#linkPrev {
float: left;
-}
-
-#linkNext {
- float: right;
-}
-
-#linkPrev IMG {
margin-right: 10px;
margin-left: 5px;
}
-#linkNext IMG {
+#linkNext {
+ float: right;
margin-right: 5px;
margin-left: 10px;
}
@@ -83,7 +77,7 @@ TABLE.infoTable TD.value UL {
list-style-type: square;
}
-.thumbnailCategories li { list-style: none; }
+.thumbnailCategories LI { list-style: none; }
.rateButton, .rateButtonSelected, .rateButtonStarFull, .rateButtonStarEmpty {
padding:0;
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index a99458458..f8f3c4fc8 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -1,7 +1,7 @@
/* $Id$ */
/* text color */
-BODY, H1, H3, DT,
+BODY, H1, H3,
INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
color:#d0d0d0;
}