diff --git a/src/app/code/community/Steverobbins/Redismanager/Block/Adminhtml/Keys.php b/src/app/code/community/Steverobbins/Redismanager/Block/Adminhtml/Keys.php index bf9034f..edc451b 100644 --- a/src/app/code/community/Steverobbins/Redismanager/Block/Adminhtml/Keys.php +++ b/src/app/code/community/Steverobbins/Redismanager/Block/Adminhtml/Keys.php @@ -84,4 +84,4 @@ protected function _getHelper() } return $this->_helper; } -} \ No newline at end of file +} diff --git a/src/app/code/community/Steverobbins/Redismanager/Block/Adminhtml/System/Config/Form/Field/Manual.php b/src/app/code/community/Steverobbins/Redismanager/Block/Adminhtml/System/Config/Form/Field/Manual.php index dc54710..a500e29 100644 --- a/src/app/code/community/Steverobbins/Redismanager/Block/Adminhtml/System/Config/Form/Field/Manual.php +++ b/src/app/code/community/Steverobbins/Redismanager/Block/Adminhtml/System/Config/Form/Field/Manual.php @@ -14,6 +14,8 @@ class Steverobbins_Redismanager_Block_Adminhtml_System_Config_Form_Field_Manual { /** * Add columns + * + * @return void */ public function __construct() { diff --git a/src/app/code/community/Steverobbins/Redismanager/Helper/Data.php b/src/app/code/community/Steverobbins/Redismanager/Helper/Data.php index b67db14..18eeb61 100644 --- a/src/app/code/community/Steverobbins/Redismanager/Helper/Data.php +++ b/src/app/code/community/Steverobbins/Redismanager/Helper/Data.php @@ -14,36 +14,30 @@ class Steverobbins_Redismanager_Helper_Data extends Mage_Core_Helper_Abstract const XML_PATH_DEFAULT_SECTION = 'redismanager'; const XML_PATH_DEFAULT_GROUP = 'settings'; - /** - * Config cache - * @var array - */ - private $_config = array(); /** * Services cache + * * @var array */ - private $_services; + protected $_services; /** * Config getter * * @param string $path + * * @return string */ public function getConfig($path) { - if (!isset($this->_config[$path])) { - $bits = explode('/', $path); - $count = count($bits); - $this->_config[$path] = Mage::getStoreConfig( - ($count == 3 ? $bits[0] : self::XML_PATH_DEFAULT_SECTION) . '/' . - ($count > 1 ? $bits[$count - 2] : self::XML_PATH_DEFAULT_GROUP) . '/' . - $bits[$count - 1] - ); - } - return $this->_config[$path]; + $bits = explode('/', $path); + $count = count($bits); + return Mage::getStoreConfig( + ($count == 3 ? $bits[0] : self::XML_PATH_DEFAULT_SECTION) . '/' . + ($count > 1 ? $bits[$count - 2] : self::XML_PATH_DEFAULT_GROUP) . '/' . + $bits[$count - 1] + ); } /** @@ -99,6 +93,7 @@ public function getServices() * @param string $port * @param string $pass * @param string $db + * * @return array */ protected function _buildServiceArray($name, $host, $port, $pass, $db) @@ -119,6 +114,7 @@ protected function _buildServiceArray($name, $host, $port, $pass, $db) * @param string $port * @param string $pass * @param string $db + * * @return Steverobbins_Redismanager_Model_Backend_Redis_Cm|Steverobbins_Redismanager_Model_Backend_Redis_Mage */ public function getRedisInstance($host, $port, $pass, $db) @@ -140,4 +136,4 @@ public function getRedisInstance($host, $port, $pass, $db) } Mage::throwException('Unable to determine Redis backend class.'); } -} \ No newline at end of file +} diff --git a/src/app/code/community/Steverobbins/Redismanager/Model/Backend/Redis/Cm.php b/src/app/code/community/Steverobbins/Redismanager/Model/Backend/Redis/Cm.php index ccd7355..ba62214 100644 --- a/src/app/code/community/Steverobbins/Redismanager/Model/Backend/Redis/Cm.php +++ b/src/app/code/community/Steverobbins/Redismanager/Model/Backend/Redis/Cm.php @@ -20,4 +20,4 @@ public function getRedis() { return $this->_redis; } -} \ No newline at end of file +} diff --git a/src/app/code/community/Steverobbins/Redismanager/Model/Backend/Redis/Mage.php b/src/app/code/community/Steverobbins/Redismanager/Model/Backend/Redis/Mage.php index 99532c9..e7e9be9 100644 --- a/src/app/code/community/Steverobbins/Redismanager/Model/Backend/Redis/Mage.php +++ b/src/app/code/community/Steverobbins/Redismanager/Model/Backend/Redis/Mage.php @@ -20,4 +20,4 @@ public function getRedis() { return $this->_redis; } -} \ No newline at end of file +} diff --git a/src/app/code/community/Steverobbins/Redismanager/Model/Source/Manual.php b/src/app/code/community/Steverobbins/Redismanager/Model/Source/Manual.php index ca8d7d4..1cb5467 100644 --- a/src/app/code/community/Steverobbins/Redismanager/Model/Source/Manual.php +++ b/src/app/code/community/Steverobbins/Redismanager/Model/Source/Manual.php @@ -14,6 +14,7 @@ class Steverobbins_Redismanager_Model_Source_Manual { /** * Event prefix for observers + * * @var string */ protected $_eventPrefix = 'redismanager_manual'; diff --git a/src/app/code/community/Steverobbins/Redismanager/controllers/Adminhtml/RedismanagerController.php b/src/app/code/community/Steverobbins/Redismanager/controllers/Adminhtml/RedismanagerController.php index 4aafb4a..c7718a4 100644 --- a/src/app/code/community/Steverobbins/Redismanager/controllers/Adminhtml/RedismanagerController.php +++ b/src/app/code/community/Steverobbins/Redismanager/controllers/Adminhtml/RedismanagerController.php @@ -17,6 +17,11 @@ class Steverobbins_Redismanager_Adminhtml_RedismanagerController */ protected $_helper; + /** + * Set title + * + * @return void + */ protected function _construct() { parent::_construct(); diff --git a/src/app/code/community/Steverobbins/Redismanager/etc/config.xml b/src/app/code/community/Steverobbins/Redismanager/etc/config.xml index 0483d51..da85c6a 100644 --- a/src/app/code/community/Steverobbins/Redismanager/etc/config.xml +++ b/src/app/code/community/Steverobbins/Redismanager/etc/config.xml @@ -13,7 +13,7 @@ - 1.2.4 + 1.2.5 diff --git a/src/app/etc/modules/Steverobbins_Redismanager.xml b/src/app/etc/modules/Steverobbins_Redismanager.xml index bf1168c..e954f74 100644 --- a/src/app/etc/modules/Steverobbins_Redismanager.xml +++ b/src/app/etc/modules/Steverobbins_Redismanager.xml @@ -21,4 +21,4 @@ - + \ No newline at end of file diff --git a/src/skin/adminhtml/default/default/steverobbins/redismanager/redismanager.css b/src/skin/adminhtml/default/default/steverobbins/redismanager/redismanager.css index bc76a2b..df9cb9a 100644 --- a/src/skin/adminhtml/default/default/steverobbins/redismanager/redismanager.css +++ b/src/skin/adminhtml/default/default/steverobbins/redismanager/redismanager.css @@ -13,9 +13,11 @@ border: 1px solid #d6d6d6; background: #fafafa; } + .redismanager table.services thead tr { background: url(../../images/sort_row_bg.gif) 0 50% repeat-x; } + .redismanager table.services th { border-width: 1px; border-color: #f9f9f9 #d1cfcf #f9f9f9 #d1cfcf; @@ -24,43 +26,56 @@ font-size: .9em; padding: 2px 4px; } + .redismanager table.services th + th { border-color: #f9f9f9 #d1cfcf #f9f9f9 #f9f9f9; } + .redismanager table.services tbody tr:hover { background: #fcf5dd; cursor: pointer; } + .redismanager table.services tr:nth-child(even) { background: #f6f6f6; } + .redismanager table.services td { border-width: 0 1px 1px 0; border-color: #dadfe0; border-style: solid; padding: 2px 4px; } + .redismanager table.services td.empty-text { padding: 15px; } + .redismanager .entry-edit-head .actions { float: right; } + .redismanager * + .content-header { margin-top: 15px; } + #redisKeys { min-width: 300px; min-height: 150px } + .redisKeySamples + * { clear: both; } + .redisKeySamples > * { font-size: 10px; float: left; } + .redisKeySamples li { float: left; margin-left: 10px; } + +\ \ No newline at end of file