Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11172] RMC/modules/xthemes/trunk/xthemes
|
From: <bi...@us...> - 2013-03-06 23:15:53
|
Revision: 11172
http://sourceforge.net/p/xoops/svn/11172
Author: bitc3r0
Date: 2013-03-06 23:15:46 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
RMC/modules/xthemes/trunk/xthemes/css/themes.css
RMC/modules/xthemes/trunk/xthemes/events/rmcommon.php
RMC/modules/xthemes/trunk/xthemes/templates/widgets/xt_wgt_themeoptions.php
RMC/modules/xthemes/trunk/xthemes/templates/xt_menu_manager.php
RMC/modules/xthemes/trunk/xthemes/templates/xt_navigation.php
RMC/modules/xthemes/trunk/xthemes/templates/xt_settings.php
RMC/modules/xthemes/trunk/xthemes/xoops_version.php
Removed Paths:
-------------
RMC/modules/xthemes/trunk/xthemes/images/icons.png
RMC/modules/xthemes/trunk/xthemes/templates/widgets/xt_wgt_sections.php
Modified: RMC/modules/xthemes/trunk/xthemes/css/themes.css
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/css/themes.css 2013-03-06 20:49:48 UTC (rev 11171)
+++ RMC/modules/xthemes/trunk/xthemes/css/themes.css 2013-03-06 23:15:46 UTC (rev 11172)
@@ -1,7 +1,46 @@
/*
$Id: themes.css 159 2012-12-06 23:51:54Z i.bitcero $
*/
+.button > i{
+ font-size: 14px;
+}
+.xt-settings-tabs{
+ background: #ebebeb;
+ margin: -10px -10px 20px -10px!important;
+ padding: 5px 10px 0 10px;
+}
+.form-horizontal .control-label{
+ width: 250px!important;
+ padding: 5px 0 5px 0;
+ text-align: left!important;
+}
+.form-horizontal .controls{
+ margin-left: 260px!important;
+ padding: 5px 0 5px 10px;
+ border-left: 1px dashed #ddd;
+}
+.tabs-vertical{
+ margin: -10px 10px -10px -10px;
+}
+.tabs-vertical ul{
+ background: #ebebeb;
+ padding: 10px 0 10px 5px;
+ border-right: 1px solid #ddd;
+ border-bottom: 0;
+}
+.tabs-vertical .nav-tabs li{
+ float: none!important;
+ margin-top: 2px;
+ margin-right: -3px;
+}
+.tabs-vertical .nav-tabs li.active a{
+ border: 1px solid #ddd!important;
+ border-radius: 5px 0 0 5px!important;
+ border-right: 0!important;
+}
+
+
.xt-separator{
clear: both;
display: block;
@@ -206,6 +245,10 @@
background: #ebebeb;
text-decoration: none;
}
+.w_options i{
+ font-size: 14px;
+ color: #000;
+}
/* Menus */
#menus-select{
@@ -334,6 +377,8 @@
opacity: 0.3;
cursor: pointer;
margin-left: 3px;
+ font-size: 16px;
+ text-shadow: 1px 1px 1px rgba(255,255,255,0.6);
}
.menu_opt_display:hover, .menu_delete:hover{
opacity: 0.9;
@@ -346,32 +391,6 @@
background: #f2f2f2;
}
-/* ICONS */
-span.icon{
- display: inline-block;
- height: 16px;
- width: 16px;
- background-repeat: no-repeat;
- background-image: url(../images/icons.png);
- line-height: 16px;
- vertical-align: text-bottom;
-}
-span.icon-home{background-position: 0 0px;}
-span.icon-install,span.icon-plus{background-position: -26px 0;}
-span.icon-uninstall,span.icon-minus{background-position: -156px 0;}
-span.icon-activate{background-position: -182px 0;}
-span.icon-view{background-position: -52px 0;}
-span.icon-info{background-position: -78px 0;}
-span.icon-close{background-position: -104px 0;}
-span.icon-closeblack{background-position: 0 -26px;}
-span.icon-menu{background-position: -130px 0;}
-span.icon-settings{background-position: -208px 0;}
-span.icon-user{background-position: -234px 0;}
-span.icon-down{background-position: -260px 0;}
-span.icon-up{background-position: -286px 0;}
-span.icon-ok{background-position: -312px 0;}
-span.icon-gear{background-position: -26px -26px;}
-
/* Messages */
#xt-messages{
padding: 10px;
Modified: RMC/modules/xthemes/trunk/xthemes/events/rmcommon.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/events/rmcommon.php 2013-03-06 20:49:48 UTC (rev 11171)
+++ RMC/modules/xthemes/trunk/xthemes/events/rmcommon.php 2013-03-06 23:15:46 UTC (rev 11172)
@@ -12,7 +12,7 @@
public function eventRmcommonLoadLeftWidgets($widgets){
global $xoopsModule, $xtAssembler;
- if(RMCLOCATION!='themes' && RMCLOCATION!='settings' && $xoopsModule->dirname()=='xthemes'){
+ if(RMCLOCATION!='themes' && $xoopsModule->dirname()=='xthemes'){
return self::showThemeInfo($widgets);
@@ -47,16 +47,6 @@
}
- public function eventRmcommonLoadRightWidgets($widgets){
- global $xoopsModule;
-
- if(RMCLOCATION=='settings' && $xoopsModule->dirname()=='xthemes')
- return self::showThemeInfo($widgets);
-
- return $widgets;
-
- }
-
private function showThemeInfo($widgets){
global $xtAssembler, $xtFunctions;
Deleted: RMC/modules/xthemes/trunk/xthemes/images/icons.png
===================================================================
(Binary files differ)
Deleted: RMC/modules/xthemes/trunk/xthemes/templates/widgets/xt_wgt_sections.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/widgets/xt_wgt_sections.php 2013-03-06 20:49:48 UTC (rev 11171)
+++ RMC/modules/xthemes/trunk/xthemes/templates/widgets/xt_wgt_sections.php 2013-03-06 23:15:46 UTC (rev 11172)
@@ -1,5 +0,0 @@
-<ul class="w_sections">
- <?php foreach($options['sections'] as $name => $section): ?>
- <li<?php if($visible==$name): ?> class="xt-section-visible"<?php endif; ?>><a href="#" class="section-<?php echo $name; ?>"><?php echo $section; ?></a></li>
- <?php endforeach; ?>
-</ul>
\ No newline at end of file
Modified: RMC/modules/xthemes/trunk/xthemes/templates/widgets/xt_wgt_themeoptions.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/widgets/xt_wgt_themeoptions.php 2013-03-06 20:49:48 UTC (rev 11171)
+++ RMC/modules/xthemes/trunk/xthemes/templates/widgets/xt_wgt_themeoptions.php 2013-03-06 23:15:46 UTC (rev 11172)
@@ -1,17 +1,17 @@
<ul class="w_options">
<?php if(method_exists($theme, 'controlPanel')): ?>
- <li><a href="theme.php"><span class="icon icon-gear"></span> <?php _e('Dashboard','xthemes'); ?></a></li>
+ <li><a href="theme.php"><i class="icon-gear"></i> <?php _e('Dashboard','xthemes'); ?></a></li>
<?php endif; ?>
<?php if($xtAssembler->rootMenus()): ?>
- <li><a href="navigation.php"><span class="icon icon-menu"></span> <?php _e('Menus','xthemes'); ?></a></li>
+ <li><a href="navigation.php"><i class="icon-reorder"></i> <?php _e('Menus','xthemes'); ?></a></li>
<?php endif; ?>
<?php if($theme->options()): ?>
- <li><a href="settings.php"><span class="icon icon-settings"></span> <?php _e('Settings','xthemes'); ?></a></li>
+ <li><a href="settings.php"><i class="icon-wrench"></i> <?php _e('Settings','xthemes'); ?></a></li>
<?php endif; ?>
<?php if($theme->getInfo('uri')!=''): ?>
- <li><a href="<?php echo $theme->getInfo('uri'); ?>" target="_blank"><span class="icon icon-home"></span> <?php _e('Website','xthemes'); ?></a></li>
+ <li><a href="<?php echo $theme->getInfo('uri'); ?>" target="_blank"><i class="icon-home"></i> <?php _e('Website','xthemes'); ?></a></li>
<?php endif; ?>
<?php if($theme->getInfo('author_uri')!=''): ?>
- <li><a href="<?php echo $theme->getInfo('author_uri'); ?>" target="_blank"><span class="icon icon-user"></span> <?php _e('Author','xthemes'); ?></a></li>
+ <li><a href="<?php echo $theme->getInfo('author_uri'); ?>" target="_blank"><i class="icon-user"></i> <?php _e('Author','xthemes'); ?></a></li>
<?php endif; ?>
</ul>
\ No newline at end of file
Modified: RMC/modules/xthemes/trunk/xthemes/templates/xt_menu_manager.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/xt_menu_manager.php 2013-03-06 20:49:48 UTC (rev 11171)
+++ RMC/modules/xthemes/trunk/xthemes/templates/xt_menu_manager.php 2013-03-06 23:15:46 UTC (rev 11172)
@@ -1,6 +1,6 @@
<?php $tc = TextCleaner::getInstance(); ?><li>
<div>
- <span class="title"><?php echo $m['title']; ?></span> <span class="icon icon-down menu_opt_display" title="<?php _e('Show options','xthemes'); ?>"></span> <span class="icon icon-minus menu_delete" title="<?php _e('Delete item','xthemes'); ?>"></span>
+ <span class="title"><?php echo $m['title']; ?></span> <i class="icon-chevron-down menu_opt_display" title="<?php _e('Show options','xthemes'); ?>"></i> <i class="icon-trash menu_delete" title="<?php _e('Delete item','xthemes'); ?>"></i>
<div class="options row">
<div class="xt-separator"></div>
<div class="option span4">
Modified: RMC/modules/xthemes/trunk/xthemes/templates/xt_navigation.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/xt_navigation.php 2013-03-06 20:49:48 UTC (rev 11171)
+++ RMC/modules/xthemes/trunk/xthemes/templates/xt_navigation.php 2013-03-06 23:15:46 UTC (rev 11172)
@@ -5,8 +5,8 @@
<?php _e('To configure menus please select a menu by clicking on tab name, and then use next form to add elements.','xthemes'); ?>
</p>
-<a href="#" class="button add-menu"><span class="icon icon-plus"></span> <?php _e('Add Menu','xthemes'); ?></a>
-<a href="#" class="button save-menu"><span class="icon icon-ok"></span> <?php _e('Save Menu','xthemes'); ?></a>
+<a href="#" class="button add-menu"><i class="icon-plus-sign"></i> <?php _e('Add Menu','xthemes'); ?></a>
+<a href="#" class="button save-menu"><i class="icon-ok-sign"></i> <?php _e('Save Menu','xthemes'); ?></a>
<div class="xt-separator"></div>
<div id="xt-messages" class="xt-msg-error">
@@ -51,7 +51,7 @@
<ol id="copy">
<li>
<div>
- <span class="title"><?php _e('Menu Item','xthemes'); ?></span> <span class="icon icon-down menu_opt_display" title="<?php _e('Show options','xthemes'); ?>"></span> <span class="icon icon-minus menu_delete" title="<?php _e('Delete item','xthemes'); ?>"></span>
+ <span class="title"><?php _e('Menu Item','xthemes'); ?></span> <i class="icon-chevron-down menu_opt_display" title="<?php _e('Show options','xthemes'); ?>"></i> <i class="icon-trash menu_delete" title="<?php _e('Delete item','xthemes'); ?>"></i>
<div class="options row" style="display: block;">
<div class="xt-separator"></div>
<div class="option span4">
Modified: RMC/modules/xthemes/trunk/xthemes/templates/xt_settings.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/templates/xt_settings.php 2013-03-06 20:49:48 UTC (rev 11171)
+++ RMC/modules/xthemes/trunk/xthemes/templates/xt_settings.php 2013-03-06 23:15:46 UTC (rev 11172)
@@ -1,38 +1,57 @@
<h1 class="rmc_titles"><?php echo sprintf(__('%s Settings','xthemes'), $xtAssembler->theme()->getInfo("name")); ?></h1>
<form name="formSettings" id="frm-settings" action="settings.php" method="post" class="form-horizontal">
-<?php foreach($sections as $name => $section): ?>
-<div id="xt-section-<?php echo $name; ?>" class="xt-configuration-section"<?php if($visible==$name): ?> style="display: block;"<?php endif; ?>>
-<h2><?php echo $section; ?></h2>
-<?php if(isset($options[$name])): ?>
- <?php foreach($options[$name] as $name => $option): ?>
- <div class="control-group">
- <label for="<?php echo $name; ?>" class="control-label">
- <strong><?php echo $option['caption']; ?></strong>
- <?php if($option['description']!=''): ?>
- <span class="xt-option-desc"><?php echo $option['description']; ?></span>
- <?php endif; ?>
- </label>
- <div class="controls">
- <?php echo $option['field']; ?>
+ <ul class="nav nav-tabs xt-settings-tabs">
+ <?php if(count($sections)<=10): ?>
+ <?php foreach($sections as $name => $section): ?>
+ <li<?php if($visible==$name): ?> class="active"<?php endif; ?>><a href="#section-<?php echo $name; ?>" data-toggle="tab"><?php echo $section; ?></a></li>
+ <?php endforeach; ?>
+ <?php else: ?>
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#"><?php _e('Configuration Sections','xthemes'); ?> <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <?php foreach($sections as $name => $section): ?>
+ <li<?php if($visible==$name): ?> class="active"<?php endif; ?>><a href="#section-<?php echo $name; ?>" data-toggle="tab"><?php echo $section; ?></a></li>
+ <?php endforeach; ?>
+ </ul>
+ </li>
+ <?php endif; ?>
+ <li class="pull-right"><button type="submit" class="btn btn-info"><?php _e('Save Settings','xthemes'); ?></button></li>
+ </ul>
+
+ <div class="tab-content">
+ <?php foreach($sections as $name => $section): ?>
+ <div id="section-<?php echo $name; ?>" class="tab-pane<?php if($visible==$name): ?> active<?php endif; ?> xt-configuration-section">
+ <?php if(isset($options[$name])): ?>
+ <?php foreach($options[$name] as $name => $option): ?>
+ <div class="control-group">
+ <label for="<?php echo $name; ?>" class="control-label">
+ <strong><?php echo $option['caption']; ?></strong>
+ <?php if($option['description']!=''): ?>
+ <span class="xt-option-desc"><?php echo $option['description']; ?></span>
+ <?php endif; ?>
+ </label>
+ <div class="controls">
+ <?php echo $option['field']; ?>
+ </div>
+ </div>
+ <?php endforeach; ?>
+ <?php endif; ?>
</div>
- </div>
- <?php endforeach; ?>
-<?php endif; ?>
-</div>
-<?php endforeach; ?>
+ <?php endforeach; ?>
-<div class="xt-settings-buttons sb-bottom">
- <div>
- <div class="alert alert-info">
- <?php _e('You can configure all sections before to press "Save Settings" button. Change between sections will not loose configured data.', 'xthemes'); ?>
+ <div class="xt-settings-buttons sb-bottom">
+ <div>
+ <div class="alert alert-info">
+ <?php _e('You can configure all sections before to press "Save Settings" button. Change between sections will not loose configured data.', 'xthemes'); ?>
+ </div>
+ <div>
+ <button type="submit" class="btn btn-large btn-inverse"><?php _e('Save Settings','xthemes'); ?></button>
+ </div>
+ </div>
</div>
- <div>
- <button type="submit" class="btn btn-large btn-inverse"><?php _e('Save Settings','xthemes'); ?></button>
- </div>
+
+ <?php echo $xoopsSecurity->getTokenHTML(); ?>
+ <input type="hidden" name="action" value="save" />
</div>
-</div>
-
-<?php echo $xoopsSecurity->getTokenHTML(); ?>
-<input type="hidden" name="action" value="save" />
</form>
\ No newline at end of file
Modified: RMC/modules/xthemes/trunk/xthemes/xoops_version.php
===================================================================
--- RMC/modules/xthemes/trunk/xthemes/xoops_version.php 2013-03-06 20:49:48 UTC (rev 11171)
+++ RMC/modules/xthemes/trunk/xthemes/xoops_version.php 2013-03-06 23:15:46 UTC (rev 11172)
@@ -27,7 +27,7 @@
$modversion['name'] = 'XThemes';
$modversion['version'] = 1.5;
$modversion['rmnative'] = '1';
-$modversion['rmversion'] = array('major'=>1,'minor'=>5, 'revision'=>18,'stage'=>-2,'name'=>'XThemes');
+$modversion['rmversion'] = array('major'=>1,'minor'=>5, 'revision'=>20,'stage'=>-1,'name'=>'XThemes');
$modversion['updateurl'] = "http://www.xoopsmexico.net/modules/vcontrol/?action=check&id=9";
$modversion['description'] = 'A module to manage themes from Red México';
$modversion['credits'] = "Eduardo Cortés <i.b...@gm...>";
|
