Paradice 3.0b

paradice/css/theme_left.css.php

@@ -3,7 +3,7 @@
 /**
  * navigation css file from theme Paradice
  *
- * @version $Id$
+ * @version $Id: theme_left.css.php 31 2010-04-06 18:39:37Z andyscherzinger $
  * @package phpMyAdmin-theme
  * @subpackage Paradice
  */
@@ -12,11 +12,14 @@
 if (!defined('PMA_MINIMUM_COMMON')) {
     exit();
 }
+
+$ipath = $_SESSION['PMA_Theme']->getImgPath();
+
 ?>
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
+    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
 }
 
 input, select, textarea {
@@ -28,11 +31,11 @@ body {
     font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
 <?php } ?>
 	font-size:			0.8em;
-    background:         <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
+    background:         <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
     color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     margin:             0;
     padding:            0.2em 0.2em 0.2em 0.2em;
-	background-image: 	url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>leftBgnd.png);
+	background-image: 	url(<?php echo $ipath; ?>leftBgnd.png);	                                   
 	background-position:left top;
 	background-repeat: 	repeat-y;
 }
@@ -67,7 +70,7 @@ select#lightm_db {
 	width:				100%;
     font-weight:        bold;
     text-align:			left;
-    background-image: 	url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
+    background-image: 	url(<?php echo $ipath; ?>s_db.png);
 	background-position:left top;
 	background-repeat: 	no-repeat;
 	padding-left:		16px;
@@ -129,11 +132,11 @@ ul#databaseList {
     padding-left: 		1.5em;
     list-style-type:    none;
     list-style-position:outside;
-    list-style-image: 	url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/paradice/img/dbitem_ltr.png);
+    list-style-image: 	url(<?php echo $ipath; ?>dbitem_ltr.png);
 }
 
 ul#databaseList ul {
-    list-style-image: 	url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/paradice/img/dbitem_ltr2.png);
+    list-style-image: 	url(<?php echo $ipath; ?>dbitem_ltr2.png);
     padding-left:		18px;
 }
 
@@ -178,7 +181,7 @@ div#leftframelinks a:hover {
 
 /* serverlist */
 #body_leftFrame #list_server {
-    list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
+    list-style-image: url(<?php echo $ipath; ?>s_host.png);
     list-style-position: inside;
     list-style-type: none;
     margin: 0;
@@ -198,7 +201,7 @@ div#left_tableList {
 div#left_tableList ul  {
     list-style-type:    none;
     list-style-position: outside;
-    list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/paradice/img/bd_sbrowse.png);
+    list-style-image: url(<?php echo $ipath; ?>bd_sbrowse.png);
     margin:             0;
     padding:            0;
 }
@@ -227,7 +230,7 @@ div#left_tableList li {
 /* marked items */
 div#left_tableList > ul li.marked > a,
 div#left_tableList > ul li.marked {
-    background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
     color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
 }
 <?php } ?>
@@ -246,9 +249,9 @@ div#left_tableList img {
 }
 
 div#left_tableList ul ul {
-    margin-left:        0;
-    padding-left:       0.1em;
-    border-left:        0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin-<?php echo $left; ?>:        0;
+    padding-<?php echo $left; ?>:       0.1em;
+    border-<?php echo $left; ?>:        0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     padding-bottom:     0.1em;
     border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }

paradice/css/theme_print.css.php

@@ -3,7 +3,7 @@
 /**
  * print css file from theme Original
  *
- * @version $Id$
+ * @version $Id: theme_print.css.php 12 2008-05-28 20:51:41Z andyscherzinger $
  * @package phpMyAdmin-theme
  * @subpackage Paradice
  */

paradice/css/theme_right.css.php

@@ -3,7 +3,7 @@
 /**
  * main css file from theme Paradice
  *
- * @version $Id$
+ * @version $Id: theme_right.css.php 31 2010-04-06 18:39:37Z andyscherzinger $
  * @package phpMyAdmin-theme
  * @subpackage Paradice
  */
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
+    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
 }
 
 input, select, textarea {
@@ -1267,7 +1267,8 @@ li#li_select_lang {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
 }
 
-li#li_select_mysql_collation {
+li#li_select_mysql_collation,
+li#li_select_mysql_charset {
     list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
     color:			  #1F457E;
 }
@@ -1530,3 +1531,27 @@ code.sql {
 	display:            block;
 	border:     		1px solid #FBFBFF;
 }
+
+/**
+  *  Progress bar styles
+  */
+div.upload_progress_bar_outer
+{
+    border: 1px solid black; 
+    width: 202px;
+}
+
+div.upload_progress_bar_inner
+{
+    background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; 
+    width: 0px; 
+    height: 12px; 
+    margin: 1px;
+}
+
+table#serverconnection_src_remote, 
+table#serverconnection_trg_remote,
+table#serverconnection_src_local, 
+table#serverconnection_trg_local  {
+  float:left;
+}

paradice/info.inc.php

@@ -1,16 +1,16 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Theme information
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
- */
-
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Theme information
+ *
+ * @version $Id: info.inc.php 12 2008-05-28 20:51:41Z andyscherzinger $
+ * @package phpMyAdmin-theme
+ * @subpackage Paradice
+ */
+
 /**
  * Theme information
  */
-$theme_name = 'Paradice';
-$theme_full_version = '2.9';
-?>
+$theme_name = 'Paradice';
+$theme_full_version = '2.9';
+?>

paradice/layout.inc.php

@@ -1,116 +1,116 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * configures general layout
- * for detailed layout configuration please refer to the css files
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * configures general layout
+ * for detailed layout configuration please refer to the css files
  *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
- */
-
-/**
- * navi frame
- */
-// navi frame width
-$GLOBALS['cfg']['NaviWidth']                = 164;
-
-// foreground (text) color for the navi frame
-$GLOBALS['cfg']['NaviColor']                = '#FFFFFF';
-
-// background for the navi frame
-$GLOBALS['cfg']['NaviBackground']           = '#3674CF';
-
-// foreground (text) color of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerColor']         = '#000000';
-// background of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerBackground']    = '#5796EF';
-// text color of the selected database name (when showing the table list)
-$GLOBALS['cfg']['NaviDatabaseNameColor']    = '#FFFFFF';
-
-/**
- * main frame
- */
-// foreground (text) color for the main frame
-$GLOBALS['cfg']['MainColor']                = '#142F56';
-
-// background for the main frame
-$GLOBALS['cfg']['MainBackground']           = '#FFFFFF';
-//$GLOBALS['cfg']['MainBackground']       = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
-
-// foreground (text) color of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerColor']       = '#FFFFFF';
-
-// background of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerBackground']  = '#5287D6';
-
-// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
-$GLOBALS['cfg']['BrowseMarkerColor']        = '#000000';
-
-// background of the marker (visually marks row by clicking on it) in browse mode
-$GLOBALS['cfg']['BrowseMarkerBackground']   = '#FBAE36';
-
-/**
- * fonts
- */
-/**
- * the font family as a valid css font family value,
- * if not set the browser default will be used
- * (depending on browser, DTD and system settings)
- */
-$GLOBALS['cfg']['FontFamily']           = 'Verdana, Arial, Helvetica, sans-serif';
-/**
- * fixed width font family, used in textarea
- */
-$GLOBALS['cfg']['FontFamilyFixed']      = '"Courier New", Courier, monospace';
-
-/**
- * tables
- */
-// border
-$GLOBALS['cfg']['Border']               = 0;
-// table header and footer color
-$GLOBALS['cfg']['ThBackground']         = '#79A2DF';
-// table header and footer background
-$GLOBALS['cfg']['ThColor']              = '#000000';
-// table data row background
-$GLOBALS['cfg']['BgOne']                = '#EEEEEE';
-// table data row background, alternate
-$GLOBALS['cfg']['BgTwo']                = '#E5E5E5';
-
-/**
- * query window
- */
-// Width of Query window
-$GLOBALS['cfg']['QueryWindowWidth']     = 600;
-// Height of Query window
-$GLOBALS['cfg']['QueryWindowHeight']    = 400;
-
-/**
- * SQL Parser Settings
- * Syntax colouring data
- */
-$GLOBALS['cfg']['SQP']['fmtColor']      = array(
-    'comment'            => '#808000',
-    'comment_mysql'      => '',
-    'comment_ansi'       => '',
-    'comment_c'          => '',
-    'digit'              => '',
-    'digit_hex'          => 'teal',
-    'digit_integer'      => 'teal',
-    'digit_float'        => 'aqua',
-    'punct'              => 'fuchsia',
-    'alpha'              => '',
-    'alpha_columnType'   => '#FF9900',
-    'alpha_columnAttrib' => '#0000FF',
-    'alpha_reservedWord' => '#990099',
-    'alpha_functionName' => '#FF0000',
-    'alpha_identifier'   => 'black',
-    'alpha_charset'      => '#6495ed',
-    'alpha_variable'     => '#800000',
-    'quote'              => '#008000',
-    'quote_double'       => '',
-    'quote_single'       => '',
-    'quote_backtick'     => ''
-);
-?>
+ * @version $Id: layout.inc.php 12 2008-05-28 20:51:41Z andyscherzinger $
+ * @package phpMyAdmin-theme
+ * @subpackage Paradice
+ */
+
+/**
+ * navi frame
+ */
+// navi frame width
+$GLOBALS['cfg']['NaviWidth']                = 164;
+
+// foreground (text) color for the navi frame
+$GLOBALS['cfg']['NaviColor']                = '#FFFFFF';
+
+// background for the navi frame
+$GLOBALS['cfg']['NaviBackground']           = '#3674CF';
+
+// foreground (text) color of the pointer in navi frame
+$GLOBALS['cfg']['NaviPointerColor']         = '#000000';
+// background of the pointer in navi frame
+$GLOBALS['cfg']['NaviPointerBackground']    = '#5796EF';
+// text color of the selected database name (when showing the table list)
+$GLOBALS['cfg']['NaviDatabaseNameColor']    = '#FFFFFF';
+
+/**
+ * main frame
+ */
+// foreground (text) color for the main frame
+$GLOBALS['cfg']['MainColor']                = '#142F56';
+
+// background for the main frame
+$GLOBALS['cfg']['MainBackground']           = '#FFFFFF';
+//$GLOBALS['cfg']['MainBackground']       = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
+
+// foreground (text) color of the pointer in browse mode
+$GLOBALS['cfg']['BrowsePointerColor']       = '#FFFFFF';
+
+// background of the pointer in browse mode
+$GLOBALS['cfg']['BrowsePointerBackground']  = '#5287D6';
+
+// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
+$GLOBALS['cfg']['BrowseMarkerColor']        = '#000000';
+
+// background of the marker (visually marks row by clicking on it) in browse mode
+$GLOBALS['cfg']['BrowseMarkerBackground']   = '#FBAE36';
+
+/**
+ * fonts
+ */
+/**
+ * the font family as a valid css font family value,
+ * if not set the browser default will be used
+ * (depending on browser, DTD and system settings)
+ */
+$GLOBALS['cfg']['FontFamily']           = 'Verdana, Arial, Helvetica, sans-serif';
+/**
+ * fixed width font family, used in textarea
+ */
+$GLOBALS['cfg']['FontFamilyFixed']      = '"Courier New", Courier, monospace';
+
+/**
+ * tables
+ */
+// border
+$GLOBALS['cfg']['Border']               = 0;
+// table header and footer color
+$GLOBALS['cfg']['ThBackground']         = '#79A2DF';
+// table header and footer background
+$GLOBALS['cfg']['ThColor']              = '#000000';
+// table data row background
+$GLOBALS['cfg']['BgOne']                = '#EEEEEE';
+// table data row background, alternate
+$GLOBALS['cfg']['BgTwo']                = '#E5E5E5';
+
+/**
+ * query window
+ */
+// Width of Query window
+$GLOBALS['cfg']['QueryWindowWidth']     = 600;
+// Height of Query window
+$GLOBALS['cfg']['QueryWindowHeight']    = 400;
+
+/**
+ * SQL Parser Settings
+ * Syntax colouring data
+ */
+$GLOBALS['cfg']['SQP']['fmtColor']      = array(
+    'comment'            => '#808000',
+    'comment_mysql'      => '',
+    'comment_ansi'       => '',
+    'comment_c'          => '',
+    'digit'              => '',
+    'digit_hex'          => 'teal',
+    'digit_integer'      => 'teal',
+    'digit_float'        => 'aqua',
+    'punct'              => 'fuchsia',
+    'alpha'              => '',
+    'alpha_columnType'   => '#FF9900',
+    'alpha_columnAttrib' => '#0000FF',
+    'alpha_reservedWord' => '#990099',
+    'alpha_functionName' => '#FF0000',
+    'alpha_identifier'   => 'black',
+    'alpha_charset'      => '#6495ed',
+    'alpha_variable'     => '#800000',
+    'quote'              => '#008000',
+    'quote_double'       => '',
+    'quote_single'       => '',
+    'quote_backtick'     => ''
+);
+?>