Changeset 2823

Timestamp:

Nov 4, 2008, 2:46:17 AM (15 years ago)

Author:

rvelices

Message:

• removed some unused constants from constants.php
• removed some unused css rules
• removed unused code

Location:

branches/2.0

Files:

• include/common.inc.php (modified) (2 diffs)
• include/constants.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (2 diffs)
• template/yoga/default-layout.css (modified) (4 diffs)
• template/yoga/picture.css (modified) (2 diffs)
• template/yoga/theme/dark/theme.css (modified) (1 diff)

branches/2.0/include/common.inc.php

@@ -144 +144 @@
 
 // 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']);
@@ -157 +152 @@
 }
 else
-{
-  // Classic template
+{ // Classic template
   $template = new Template(PHPWG_ROOT_PATH.'template/'
     . $user['template'], $user['theme'] );

branches/2.0/include/constants.php

@@ -33 +33 @@
 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

branches/2.0/include/functions_user.inc.php

@@ -211 +211 @@
   // 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']);
@@ -1374 +1368 @@
   else
   {
-    if ($force_one_condition)
-    {
-      $sql = '1 = 1';
-    }
-    else
-    {
-      $sql = '';
-    }
+    $sql = $force_one_condition ? '1 = 1' : '';
   }
 

branches/2.0/template/yoga/default-layout.css

@@ -47 +47 @@
 }
 
-/** General defaults **/
 INPUT, SELECT {
         margin: 0;
@@ -58 +57 @@
 }
 
-/** forms **/
 
 FORM { padding: 0; margin: 0; }
@@ -71 +69 @@
         margin-top: 1em;
         margin-bottom: 0;
-}
-
-TEXTAREA.description {
-        height: 6em;
-        width: 40em;
-        overflow: auto;
 }
 
@@ -275 +267 @@
 #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;
 }

branches/2.0/template/yoga/picture.css

@@ -56 +56 @@
 #linkPrev {
         float: left;
+        margin-right: 10px;
+        margin-left: 5px;
 }
 
 #linkNext {
         float: right;
-}
-
-#linkPrev IMG {
-        margin-right: 10px;
-        margin-left: 5px;
-}
-
-#linkNext IMG {
         margin-right: 5px;
         margin-left: 10px;
@@ -84 +78 @@
 }
 
-.thumbnailCategories li { list-style: none; }
+.thumbnailCategories LI { list-style: none; }
 
 .rateButton, .rateButtonSelected, .rateButtonStarFull, .rateButtonStarEmpty  {

branches/2.0/template/yoga/theme/dark/theme.css

@@ -2 +2 @@
 
 /* text color */
-BODY, H1, H3, DT,
+BODY, H1, H3,
 INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
         color:#d0d0d0;