updated some themes to make colors more vivid and readable

fixed HTML bugs in folders.php
fixed bugs in message hightlighting submission and saving

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@652 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/folders.php b/src/folders.php
index 35b5a39fcc2c3c3108d689d823d9d6bb01939194..2b2566c52b8f9781cb93511de03ab5e84eb5077e 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -92,9 +92,9 @@
            if (!sqimap_mailbox_exists ($imapConnection, $trash_folder)){
            echo _("Create Trash") . "<INPUT TYPE=checkbox NAME=trash_create value=true><br>\n";
            echo "<INPUT TYPE=submit VALUE=Create>";
-           echo "</FORM></TD></TR>\n";
            }
        }
+       echo "</FORM></TD></TR></TABLE>n";
    }
 
    /** DELETING FOLDERS **/

diff --git a/src/options_highlight.php b/src/options_highlight.php
index ae648b9e8960c47950e89944c2fa07d258c41f50..868920b230d1d7713409feada7817093e0826c5a 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -27,11 +27,11 @@
       include("../functions/i18n.php");
 
 
-   if ($action == "delete" && isset($id)) {
-      removePref($data_dir, $username, "highlight$id");
+   if ($action == "delete" && isset($theid)) {
+      removePref($data_dir, $username, "highlight$theid");
    } else if ($action == "save") {
-      if (!$id) $id = 0;
-      $name = ereg_replace(",", " ", $name);
+      if (!$theid) $theid = 0;
+      $identname = ereg_replace(",", " ", $identname);
       if ($color_type == 1) $newcolor = $newcolor_choose;
       else $newcolor = $newcolor_input;
  
@@ -39,11 +39,11 @@
       $newcolor = ereg_replace("#", "", $newcolor);
       $newcolor = "$newcolor";
       $value = ereg_replace(",", " ", $value);
-      setPref($data_dir, $username, "highlight$id", $name.",".$newcolor.",".$value.",".$match_type);
-      $message_highlight_list[$id]["name"] = $name;
-      $message_highlight_list[$id]["color"] = $newcolor;
-      $message_highlight_list[$id]["value"] = $value;
-      $message_highlight_list[$id]["match_type"] = $match_type;
+      setPref($data_dir, $username, "highlight$theid", $identname.",".$newcolor.",".$value.",".$match_type);
+      $message_highlight_list[$theid]["name"] = $identname;
+      $message_highlight_list[$theid]["color"] = $newcolor;
+      $message_highlight_list[$theid]["value"] = $value;
+      $message_highlight_list[$theid]["match_type"] = $match_type;
    } 
    include("../src/load_prefs.php");
    displayPageHeader($color, "None");
@@ -61,7 +61,7 @@
       for ($i=0; $i < count($message_highlight_list); $i++) {
          echo "<tr>\n";
          echo "   <td width=1% bgcolor=" . $color[4] . ">\n";
-         echo "<nobr><small>[<a href=\"options_highlight.php?action=edit&id=$i\">" . _("Edit") . "</a>]&nbsp;[<a href=\"options_highlight.php?action=delete&id=$i\">"._("Delete")."</a>]</small></nobr>\n";
+         echo "<nobr><small>[<a href=\"options_highlight.php?action=edit&theid=$i\">" . _("Edit") . "</a>]&nbsp;[<a href=\"options_highlight.php?action=delete&theid=$i\">"._("Delete")."</a>]</small></nobr>\n";
          echo "   </td>";
          echo "   <td bgcolor=" . $message_highlight_list[$i]["color"] . ">\n";
          echo "      " . $message_highlight_list[$i]["name"];
@@ -78,7 +78,7 @@
       echo "<br>\n";
    }
    if ($action == "edit" || $action == "add") {
-      if (!isset($id)) $id = count($message_highlight_list);
+      if (!isset($theid)) $theid = count($message_highlight_list);
  
       $color_list[0] = "4444aa";
       $color_list[1] = "44aa44";
@@ -95,27 +95,27 @@
       $color_list[12] = "dfdfdf";
       $color_list[13] = "ffffff";               
       for ($i=0; $i < 14; $i++) {
-         if ($color_list[$i] == $message_highlight_list[$id]["color"]) {
+         if ($color_list[$i] == $message_highlight_list[$theid]["color"]) {
             $selected_choose = " checked";
             ${"selected".$i} = " selected";
             continue;
          }
       }
-      if (!$message_highlight_list[$id]["color"])
+      if (!$message_highlight_list[$theid]["color"])
          $selected_choose = " checked";
       else if (!$selected_choose)
          $selected_input = " checked";
  
       echo "<form action=\"options_highlight.php\">\n";
       echo "<input type=\"hidden\" value=\"save\" name=\"action\">\n";
-      echo "<input type=\"hidden\" value=\"$id\" name=\"id\">\n";
+      echo "<input type=\"hidden\" value=\"$theid\" name=\"theid\">\n";
       echo "<table width=80% align=center cellpadding=3 cellspacing=0 border=0>\n";
       echo "   <tr bgcolor=\"$color[0]\">\n";
       echo "      <td align=right width=25%><b>\n";
       echo _("Identifying name") . ":";
       echo "      </b></td>\n";
       echo "      <td width=75%>\n";
-      echo "         <input type=\"text\" value=\"".$message_highlight_list[$id]["name"]."\" name=\"name\">";
+      echo "         <input type=\"text\" value=\"".$message_highlight_list[$theid]["name"]."\" name=\"identname\">";
       echo "      </td>\n";
       echo "   </tr>\n";
       echo "   <tr><td><small><small>&nbsp;</small></small></td></tr>\n";
@@ -141,7 +141,7 @@
       echo "            <option value=\"$color_list[13]\"$selected13>" . _("White") . "\n";
       echo "         </select><br>\n";
       echo "         <input type=\"radio\" name=color_type value=2$selected_input> &nbsp;". _("Other:") ."<input type=\"text\" value=\"";                                 
-      if ($selected_input) echo $message_highlight_list[$id]["color"];
+      if ($selected_input) echo $message_highlight_list[$theid]["color"];
       echo "\" name=\"newcolor_input\" size=7> "._("Ex: 63aa7f")."<br>\n";
       echo "      </td>\n";
       echo "   </tr>\n";
@@ -152,18 +152,18 @@
       echo "      </b></td>\n";
       echo "      <td width=75%>\n";
       echo "         <select name=match_type>\n";
-      if ($message_highlight_list[$id]["match_type"] == "from")    echo "            <option value=\"from\" selected>From\n";
+      if ($message_highlight_list[$theid]["match_type"] == "from")    echo "            <option value=\"from\" selected>From\n";
       else                                                         echo "            <option value=\"from\">From\n";
-      if ($message_highlight_list[$id]["match_type"] == "to")      echo "            <option value=\"to\" selected>To\n";
+      if ($message_highlight_list[$theid]["match_type"] == "to")      echo "            <option value=\"to\" selected>To\n";
       else                                                         echo "            <option value=\"to\">To\n";
-      if ($message_highlight_list[$id]["match_type"] == "cc")      echo "            <option value=\"cc\" selected>Cc\n";
+      if ($message_highlight_list[$theid]["match_type"] == "cc")      echo "            <option value=\"cc\" selected>Cc\n";
       else                                                         echo "            <option value=\"cc\">Cc\n";
-      if ($message_highlight_list[$id]["match_type"] == "to_cc")   echo "            <option value=\"to_cc\" selected>To or Cc\n";
+      if ($message_highlight_list[$theid]["match_type"] == "to_cc")   echo "            <option value=\"to_cc\" selected>To or Cc\n";
       else                                                         echo "            <option value=\"to_cc\">To or Cc\n";
-      if ($message_highlight_list[$id]["match_type"] == "subject") echo "            <option value=\"subject\" selected>Subject\n";
+      if ($message_highlight_list[$theid]["match_type"] == "subject") echo "            <option value=\"subject\" selected>Subject\n";
       else                                                         echo "            <option value=\"subject\">Subject\n";
       echo "         </select>\n";
-      echo "         <nobr><input type=\"text\" value=\"".$message_highlight_list[$id]["value"]."\" name=\"value\"> &nbsp;(";
+      echo "         <nobr><input type=\"text\" value=\"".$message_highlight_list[$theid]["value"]."\" name=\"value\"> &nbsp;(";
       echo _("Regular Expression");
       echo ")\n      <nobr></td>\n";
       echo "   </tr>\n";

diff --git a/themes/deepocean_theme.php b/themes/deepocean_theme.php
index 3b04137da598e6684d8b710b9a9ce1c38aae1735..09a86d288977b540f52722eed2a1c5f2500fcfb5 100644 (file)
--- a/themes/deepocean_theme.php
+++ b/themes/deepocean_theme.php
@@ -6,16 +6,16 @@
        Deep Ocean is a theme that is very blue.
     **/
 
-    $color[0]   = "#597E9B"; // (light gray)     TitleBar
+    $color[0]   = "#6188A9"; // (light gray)     TitleBar
     $color[1]   = "#800000"; // (red)
     $color[2]   = "#CC0000"; // (light red)      Warning/Error Messages
-    $color[3]   = "#183667"; // (green-blue)     Left Bar Background
+    $color[3]   = "#294763"; // (green-blue)     Left Bar Background
     $color[4]   = "#7A9CBF"; // (white)          Normal Background
-    $color[5]   = "#B5C9DF"; // (light yellow)   Table Headers
+    $color[5]   = "#597D9D"; // (light yellow)   Table Headers
     $color[6]   = "#FFFFFF"; // (black)          Text on left bar
-    $color[7]   = "#014D7B"; // (blue)           Links
+    $color[7]   = "#014070"; // (blue)           Links
     $color[8]   = "#000000"; // (black)          Normal text
-    $color[9]   = "#395E7B"; // (mid-gray)       Darker version of #0
+    $color[9]   = "#587B99"; // (mid-gray)       Darker version of #0
     $color[10]  = "#496E8B"; // (dark gray)      Darker version of #9
     $color[11]  = "#A7C5F3"; // (dark red)       Special Folders color
 ?>

diff --git a/themes/plain_blue_theme.php b/themes/plain_blue_theme.php
index 6809f34718e8d39472db8a96997a63aca43947e6..c40ec64f100984def06ccd406ec13a9869854578 100644 (file)
--- a/themes/plain_blue_theme.php
+++ b/themes/plain_blue_theme.php
@@ -4,16 +4,16 @@
        Theme Name:   "Plain Blue"
     **/
 
-    $color[0]   = "#B2C5D4"; // (light gray)     TitleBar
-    $color[1]   = "#800000"; // (red)
-    $color[2]   = "#CC0000"; // (light red)      Warning/Error Messages
-    $color[3]   = "#6795B9"; // (green-blue)     Left Bar Background
-    $color[4]   = "#FFFFFF"; // (white)          Normal Background
-    $color[5]   = "#98B0C3"; // (light yellow)   Table Headers
-    $color[6]   = "#000000"; // (black)          Text on left bar
-    $color[7]   = "#0000CC"; // (blue)           Links
-    $color[8]   = "#000000"; // (black)          Normal text
-    $color[9]   = "#92A5B4"; // (mid-gray)       Darker version of #0
-    $color[10]  = "#376589"; // (dark gray)      Darker version of #9
-    $color[11]  = "#770000"; // (dark red)       Special Folders color
+    $color[0]   = "#A2BED4"; // TitleBar
+    $color[1]   = "#800000"; // 
+    $color[2]   = "#CC0000"; // Warning/Error Messages
+    $color[3]   = "#6795B9"; // Left Bar Background
+    $color[4]   = "#FFFFFF"; // Normal Background
+    $color[5]   = "#94ABC0"; // Table Headers
+    $color[6]   = "#000000"; // Text on left bar
+    $color[7]   = "#0000CC"; // Links
+    $color[8]   = "#000000"; // Normal text
+    $color[9]   = "#83A0BA"; // Darker version of #0
+    $color[10]  = "#376589"; // Darker version of #9
+    $color[11]  = "#770000"; // Special Folders color
 ?>