Moved DEFAULT_TABLE_WIDTH to webconfig

jeroenrnl · Oct 20, 2012 · fcd07dd · fcd07dd
1 parent cdd67fc
commit fcd07dd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/php/classes/conf.inc.php b/php/classes/conf.inc.php
@@ -161,6 +161,14 @@ private static function getDefault() {
         $int_title->setRegex("^.*$");
         $interface[]=$int_title;
 
+        $int_width = new confItemString(); 
+        $int_width->setName("interface.width");
+        $int_width->setLabel("Screen width");
+        $int_width->setDesc("A number in pixels (\"px\") or percent (\"%\"), the latter is a percentage of the user's browser window width.");
+        $int_width->setDefault("600px");
+        $int_width->setRegex("^[0-9]+(px|%)$");
+        $interface[]=$int_width;
+
         $int_css = new confItemString(); 
         $int_css->setName("interface.css");
         $int_css->setLabel("Style Sheet");

diff --git a/php/config.inc.php b/php/config.inc.php
@@ -265,7 +265,8 @@
     // width of the main table
     // May be in pixels ("px") or percent ("%").
     // As of v0.6, the entity is required.
-    define('DEFAULT_TABLE_WIDTH', "600px");
+    // Deprecated: Modify through admin -> config in web interface.
+    //define('DEFAULT_TABLE_WIDTH', "600px");
     // define('DEFAULT_TABLE_WIDTH', "90%");
 
     // set to the id of a non admin user or to 0 to disable

diff --git a/php/css.php b/php/css.php
@@ -18,15 +18,12 @@
 
 header("Content-Type: text/css");
 if(isset($_GET['logged_on'])) {
-    require_once("log.inc.php");
-    require_once("config.inc.php");
-    require_once("classes/zophTable.inc.php");
-    require_once("user.inc.php");
+    define("LOGON", true);
     echo "/* This is the default CSS, the user is not logged on */";
 } else {
-    require_once("include.inc.php");
     echo "/* This is the customized CSS, user is logged on */";
 }
+require_once("include.inc.php");
 
 ?>
 
@@ -39,7 +36,7 @@
     font-size: medium;
     color: <?php echo $TEXT_COLOR ?>;
     background: <?php echo $PAGE_BG_COLOR ?>;
-    width: <?php echo DEFAULT_TABLE_WIDTH ?>;
+    width: <?php echo conf::get("interface.width"); ?>;
     border: none;
     margin-left: auto; /* To center the page */
     margin-right: auto;
@@ -670,9 +667,9 @@
     }
 
 div.intro {
-    float: right;
+    margin-left: 15px;
+    float: left;
     clear: right;
-    width: <?php echo DEFAULT_TABLE_WIDTH-THUMB_SIZE-50 ?>px;
     }
 
 div.intro ul {

diff --git a/php/photos.php b/php/photos.php
@@ -77,7 +77,8 @@
 
     if (!($num_thumbnails == 0 || $_cols <= 4)) {
         $width = ((THUMB_SIZE + 14) * $_cols) + 25;
-        if ($width > DEFAULT_TABLE_WIDTH || strpos(DEFAULT_TABLE_WIDTH, "%")) {
+        $default_width= conf::get("interface.width");
+        if ($width > $default_width || strpos($default_width, "%")) {
             $extrastyle = "body	{ width: " . $width . "px; }\n"; 
         }
     }