|
From: <bi...@us...> - 2013-05-20 04:18:31
|
Revision: 11560
http://sourceforge.net/p/xoops/svn/11560
Author: bitc3r0
Date: 2013-05-20 04:18:25 +0000 (Mon, 20 May 2013)
Log Message:
-----------
Templates fixed and applied the new graphical features (toolbar, breadcrumb, menus)
Modified Paths:
--------------
RMC/rmcommon/trunk/rmcommon/blocks.php
RMC/rmcommon/trunk/rmcommon/class/fields/groups.class.php
RMC/rmcommon/trunk/rmcommon/class/functions.php
RMC/rmcommon/trunk/rmcommon/comments.php
RMC/rmcommon/trunk/rmcommon/css/comms-admin.css
RMC/rmcommon/trunk/rmcommon/css/forms.css
RMC/rmcommon/trunk/rmcommon/css/imgmgr.css
RMC/rmcommon/trunk/rmcommon/images.php
RMC/rmcommon/trunk/rmcommon/include/js/images.js
RMC/rmcommon/trunk/rmcommon/include/js/imgmanager.js
RMC/rmcommon/trunk/rmcommon/lang/es.mo
RMC/rmcommon/trunk/rmcommon/lang/es.po
RMC/rmcommon/trunk/rmcommon/modules.php
RMC/rmcommon/trunk/rmcommon/plugins.php
RMC/rmcommon/trunk/rmcommon/templates/categories_form.php
RMC/rmcommon/trunk/rmcommon/templates/images_categories.php
RMC/rmcommon/trunk/rmcommon/templates/images_edit.php
RMC/rmcommon/trunk/rmcommon/templates/images_images.php
RMC/rmcommon/trunk/rmcommon/templates/images_uploadimages.php
RMC/rmcommon/trunk/rmcommon/templates/rmc_comments.php
RMC/rmcommon/trunk/rmcommon/templates/rmc_plugins.php
RMC/rmcommon/trunk/rmcommon/templates/rmc_users.php
RMC/rmcommon/trunk/rmcommon/themes/twop6/css/2.6.css
RMC/rmcommon/trunk/rmcommon/themes/twop6/modules/rmcommon/rmc_breadcrumb.php
RMC/rmcommon/trunk/rmcommon/themes/twop6/theme.php
RMC/rmcommon/trunk/rmcommon/updates.php
RMC/rmcommon/trunk/rmcommon/users.php
Removed Paths:
-------------
RMC/rmcommon/trunk/rmcommon/themes/twop6/css/rmcommon/imgmgr.css
Modified: RMC/rmcommon/trunk/rmcommon/blocks.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/blocks.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/blocks.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -67,7 +67,7 @@
function show_rm_blocks()
{
- global $xoopsModule, $xoopsConfig, $wid_globals, $xoopsSecurity, $rmc_config;
+ global $xoopsModule, $xoopsConfig, $wid_globals, $xoopsSecurity, $rmc_config, $rmTpl;
define('RMCSUBLOCATION','blocks');
$db = XoopsDatabaseFactory::getDatabaseConnection();
@@ -129,8 +129,9 @@
RMTemplate::get()->add_local_script('jquery.sort.js', 'rmcommon', 'include');
}
- xoops_cp_location('<a href="./">' . $xoopsModule->getVar('name') .
- '</a> » ' . __('Blocks','rmcommon'));
+ RMBreadCrumb::get()->add_crumb(__('Blocks Management','rmcommon'));
+ $rmTpl->assign('xoops_pagetitle', __('Blocks Management','rmcommon'));
+
RMTemplate::get()->add_style('blocks.css', 'rmcommon');
RMTemplate::get()->add_local_script('blocks.js', 'rmcommon', 'include');
RMTemplate::get()->add_local_script('jkmenu.js', 'rmcommon', 'include');
Modified: RMC/rmcommon/trunk/rmcommon/class/fields/groups.class.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/class/fields/groups.class.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/class/fields/groups.class.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -154,7 +154,7 @@
$rtn .= " checked='checked'";
}
}
- $rtn .= ">".__('All','rmcommon')."</label></li>";
+ $rtn .= "> ".__('All','rmcommon')."</label></li>";
while ($row = $db->fetchArray($result)){
$rtn .= "<li><label><input type='$typeinput' name='$name' id='".$this->id()."' value='$row[groupid]'";
@@ -163,7 +163,7 @@
$rtn .= " checked='checked'";
}
}
- $rtn .= ">$row[name]</label>";
+ $rtn .= "> $row[name]</label>";
if ($this->_showdesc){
$rtn .= "<br /><span style='font-size: 10px;' class='description'>$row[description]</span>";
Modified: RMC/rmcommon/trunk/rmcommon/class/functions.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/class/functions.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/class/functions.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -99,10 +99,10 @@
RMTemplate::get()->add_tool(__('Images','rmcommon'), 'images.php', 'images/images.png', 'imgmanager');
RMTemplate::get()->add_tool(__('Comments','rmcommon'), 'comments.php', 'images/comments.png', 'comments');
RMTemplate::get()->add_tool(__('Plugins','rmcommon'), 'plugins.php', 'images/plugin.png', 'plugins');
+ RMTemplate::get()->add_tool(__('Updates','rmcommon'), 'updates.php', 'images/updates.png', 'updates');
}
-
- RMTemplate::get()->add_tool(__('Updates','rmcommon'), 'updates.php', 'images/updates.png', 'updates');
+
RMEvents::get()->run_event('rmcommon.create.toolbar');
}
Modified: RMC/rmcommon/trunk/rmcommon/comments.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/comments.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/comments.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -12,7 +12,7 @@
define('RMCLOCATION','comments');
function show_comments(){
- global $xoopsSecurity;
+ global $xoopsSecurity, $rmTpl;
$db = XoopsDatabaseFactory::getDatabaseConnection();
@@ -121,7 +121,11 @@
}
$comments = RMEvents::get()->run_event('rmcommon.loading.admin.comments', $comments);
-
+
+ RMBreadCrumb::get()->add_crumb(__('Comments Manager','rmcommon'));
+
+ $rmTpl->assign('xoops_pagetitle', __('Comments Manager','rmcommon'));
+
xoops_cp_header();
RMFunctions::create_toolbar();
RMTemplate::get()->add_style('comms-admin.css', 'rmcommon');
@@ -234,7 +238,8 @@
}
function edit_comment(){
-
+ global $rmTpl;
+
$id = rmc_server_var($_GET,'id',0);
$page = rmc_server_var($_GET, 'page', 1);
$filter = rmc_server_var($_GET, 'filter', '');
@@ -288,6 +293,12 @@
$form->addElement($ele);
RMFunctions::create_toolbar();
+
+ RMBreadCrumb::get()->add_crumb(__('Comments Manager','rmcommon'),'comments.php');
+ RMBreadCrumb::get()->add_crumb(__('Edit Comment','rmcommon'));
+
+ $rmTpl->assign('xoops_pagetitle', __('Edit Comment','rmcommon'));
+
xoops_cp_header();
$form->display();
xoops_cp_footer();
Modified: RMC/rmcommon/trunk/rmcommon/css/comms-admin.css
===================================================================
--- RMC/rmcommon/trunk/rmcommon/css/comms-admin.css 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/css/comms-admin.css 2013-05-20 04:18:25 UTC (rev 11560)
@@ -18,6 +18,3 @@
font-size: 0.9em;
color: #666;
}
-.comments_search{
- float: right;
-}
\ No newline at end of file
Modified: RMC/rmcommon/trunk/rmcommon/css/forms.css
===================================================================
--- RMC/rmcommon/trunk/rmcommon/css/forms.css 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/css/forms.css 2013-05-20 04:18:25 UTC (rev 11560)
@@ -289,3 +289,13 @@
padding: 1px;
border: 1px solid #CCC;
}
+
+/** Groups **/
+.groups_field_list{
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+.groups_field_list input{
+ vertical-align: text-top;
+}
\ No newline at end of file
Modified: RMC/rmcommon/trunk/rmcommon/css/imgmgr.css
===================================================================
--- RMC/rmcommon/trunk/rmcommon/css/imgmgr.css 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/css/imgmgr.css 2013-05-20 04:18:25 UTC (rev 11560)
@@ -1,23 +1,56 @@
+.form-container{
+ margin: 0 60px;
+}
+.form-container label.control-label{
+ font-weight: bold;
+}
+.single-size{
+ border: 1px solid #ddd;
+ border-radius: 3px;
+ display: inline-block;
+ width: 250px;
+ padding: 15px;
+ margin: 0 5px 5px 0;
+ color: #666;
+}
+.form-container .form-actions{
+ padding: 10px!important;
+ margin: 15px -15px -15px -15px;
+ border-radius: 0 0 3px 3px;
+}
+.form-container .new-container{
+ margin: 15px 0;
+}
+.form-container input[name*="[name]"]{
+ font-weight: bold;
+ text-decoration: underline;
+}
+.form-container .cat-buttons{
+ padding: 15px 0 0 0;
+ border-top: 1px solid #eee;
+ margin-top: 20px;
+}
+
a.delsize{
- float: right;
- font-weight: normal;
- background: url(../images/delete.png) no-repeat left;
- padding: 3px 3px 3px 19px;
+ float: right;
+ font-weight: normal;
+ background: url(../images/delete.png) no-repeat left;
+ padding: 3px 3px 3px 19px;
}
td#sizes-container-all{
- overflow: hidden;
+ overflow: hidden;
}
td#sizes-container-all table.outer{
- width: 435px;
- float: left;
+ width: 435px;
+ float: left;
}
td#sizes-container-all table{
- margin: 5px;
+ margin: 5px;
}
td#sizes-container-all div.new_container{
- clear: both;
- margin-top: 10px;
- text-align: center;
+ clear: both;
+ margin-top: 10px;
+ text-align: center;
}
td.sizes_data{
font-size: 0.9em;
@@ -30,92 +63,76 @@
/** IMAGES **/
div.select_image_cat{
- padding: 4px;
- border: 1px solid #CCC;
- margin: 0 auto;
- background: #ebebeb;
+ border-bottom: 1px dotted #ddd;
+ margin: 0 0 20px 0;
font-weight: bold;
- text-align: center;
margin-bottom: 10px;
}
#upload-errors{
- padding: 10px;
- margin: 10px 0;
- float: right;
- width: 300px;
+ padding: 10px;
+ margin: 10px 0;
+ float: right;
+ width: 300px;
}
#upload-errors span.failed{
- background: url(../images/error.png) no-repeat left;
- padding: 5px 0 5px 19px;
- color: #f00;
- margin: 2px 0;
- display: block;
+ background: url(../images/error.png) no-repeat left;
+ padding: 5px 0 5px 19px;
+ color: #f00;
+ margin: 2px 0;
+ display: block;
}
#upload-errors span.done{
- background: url(../images/done.png) no-repeat left;
- padding: 5px 0 5px 19px;
- margin: 2px 0;
- display: block;
+ background: url(../images/done.png) no-repeat left;
+ padding: 5px 0 5px 19px;
+ margin: 2px 0;
+ display: block;
}
#resizer-bar{
- text-align: center;
- font-size: 0.9em;
- color: #666;
- display: none;
+ text-align: center;
+ font-size: 0.9em;
+ color: #666;
+ display: none;
}
#resizer-bar span.message{
- display: block;
- float: left;
- color: #008000;
+ display: block;
+ float: left;
+ color: #008000;
}
#resizer-bar span.message span{
- color: #F00;
+ color: #F00;
}
-#resizer-bar .thebar{
- background: #999;
- height: 16px;
- border: 1px inset #666;
- margin: 5px;
- clear: both;
-}
-#resizer-bar .thebar .indicator{
- background: #ff4400;
- color: #FFF;
- font-weight: bold;
- height: 16px;
- width: 0;
- text-align: right;
- position: relative;
-}
div.donebutton{
- display: none;
- margin: 10px 0;
+ display: none;
+ margin: 10px 0;
}
div#gen-thumbnails img{
- width: 90px;
- height: 70px;
- margin: 4px;
- padding: 1px;
- border: 1px solid #666;
+ width: 90px;
+ height: 70px;
+ margin: 4px;
+ padding: 1px;
+ border: 1px solid #666;
}
.even .description, .odd .description{
- font-size: 0.9em;
- display: block;
- padding: 2px 0;
- font-style: italic;
- color: #666;
+ font-size: 0.9em;
+ display: block;
+ padding: 2px 0;
+ font-style: italic;
+ color: #666;
}
.rmc_pages_navigation_container{
- float: right;
+ float: right;
}
#image-loader{
- display: none;
- position: absolute;
- padding: 10px;
- background: #fff;
- top: 50%;
- left: 50%;
- -moz-box-shadow: 0 0 20px #000;
- -webkit-box-shadow: 0 0 20px #000;
- box-shadow: 0 0 20px #000;
+ display: none;
+ position: absolute;
+ padding: 10px;
+ background: #fff;
+ top: 50%;
+ left: 50%;
+ -moz-box-shadow: 0 0 20px #000;
+ -webkit-box-shadow: 0 0 20px #000;
+ box-shadow: 0 0 20px #000;
+}
+#upload-controls input{
+ float: none;
}
\ No newline at end of file
Modified: RMC/rmcommon/trunk/rmcommon/images.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/images.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/images.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -21,7 +21,7 @@
* Show all images existing in database
*/
function show_images(){
- global $xoopsModule, $xoopsModuleConfig;
+ global $xoopsModule, $xoopsModuleConfig, $rmTpl;
define('RMCSUBLOCATION','showimages');
@@ -109,7 +109,12 @@
RMLightbox::get()->add_element('#list-images a.bigimages');
RMLightbox::get()->render();
}
-
+
+ RMBreadCrumb::get()->add_crumb(__('Images Management','rmcommon'),'images.php');
+ RMBreadCrumb::get()->add_crumb($category->getVar('name'));
+
+ $rmTpl->assign('xoops_pagetitle', sprintf(__('Images Management: %s', 'rmcommon'), $category->getVar('name')));
+
xoops_cp_header();
RMFunctions::create_toolbar();
RMTemplate::get()->add_style('imgmgr.css','rmcommon');
@@ -185,9 +190,18 @@
// Load Categories
$categories = RMFunctions::load_images_categories("WHERE status='open' ORDER BY id_cat DESC");
-
+
+ RMFunctions::create_toolbar();
+
+ RMBreadCrumb::get()->add_crumb(__('Images Manager','rmcommon'), 'images.php');
+ if(!$cat->isNew()){
+ RMBreadCrumb::get()->add_crumb($cat->getVar('name'), 'images.php?category='.$cat->id());
+ RMBreadCrumb::get()->add_crumb(__('Upload Images','rmcommon'));
+ } else {
+ RMBreadCrumb::get()->add_crumb(__('Upload Images','rmcommon'));
+ }
+
xoops_cp_header();
- RMFunctions::create_toolbar();
include RMTemplate::get()->get_template('images_uploadimages.php','module','rmcommon');
@@ -196,7 +210,7 @@
}
function show_categories(){
- global $xoopsModule, $xoopsModuleConfig, $xoopsConfig, $xoopsSecurity;
+ global $xoopsModule, $xoopsModuleConfig, $xoopsConfig, $xoopsSecurity, $rmTpl;
define('RMCSUBLOCATION','showcategories');
@@ -242,6 +256,12 @@
RMTemplate::get()->add_style('imgmgr.css','rmcommon');
RMTemplate::get()->add_script('include/js/jquery.checkboxes.js');
RMFunctions::create_toolbar();
+
+ RMBreadCrumb::get()->add_crumb(__('Images Manager','rmcommon'), 'images.php');
+ RMBreadCrumb::get()->add_crumb(__('Categories','rmcommon'));
+
+ $rmTpl->assign('xoops_pagetitle', __('Images Manager: Categories','rmcommon'));
+
xoops_cp_header();
@@ -255,6 +275,8 @@
* Show form to create categories
*/
function new_category($edit = 0){
+ global $rmTpl;
+
define('RMCSUBLOCATION','newcategory');
extract($_GET);
@@ -283,6 +305,12 @@
}
RMFunctions::create_toolbar();
+
+ RMBreadCrumb::get()->add_crumb(__('Images Manager','rmcommon'),'images.php');
+ RMBreadCrumb::get()->add_crumb(__('Add Category','rmcommon'));
+
+ $rmTpl->assign('xoops_pagetitle', __('Images Manager: Add category','rmcommon'));
+
xoops_cp_header();
$form = new RMForm('','','');
@@ -535,7 +563,7 @@
* Function to edit images
*/
function edit_image(){
- global $xoopsUser, $xoopsSecurity;
+ global $xoopsUser, $xoopsSecurity, $rmTpl, $rmEvents;
$id = rmc_server_var($_GET, 'id', 0);
$page = rmc_server_var($_GET, 'page', '');
@@ -566,7 +594,10 @@
$current_size = $size;
}
}
-
+
+ if(!file_exists(XOOPS_UPLOAD_PATH.$updir.'/sizes/'.$fd['filename'].'_'.$size['width'].'x'.$size['height'].'.'.$fd['extension']))
+ continue;
+
$image_data['sizes'][] = array(
'file' => XOOPS_UPLOAD_URL.$updir.'/sizes/'.$fd['filename'].'_'.$size['width'].'x'.$size['height'].'.'.$fd['extension'],
'name' => $size['name']
@@ -584,9 +615,14 @@
$image_data['url'] = XOOPS_UPLOAD_URL.$updir.'/'.$image->getVar('file');
$categories = RMFunctions::load_images_categories("WHERE status='open' ORDER BY id_cat DESC");
-
+
+ RMFunctions::create_toolbar();
+ RMBreadCrumb::get()->add_crumb(__('Images Manager','rmcommon'),'images.php');
+ RMBreadCrumb::get()->add_crumb(__('Edit Image','rmcommon'));
+
+ $rmTpl->assign('xoops_pagetitle', __('Edit Image','rmcommon'));
+
xoops_cp_header();
- RMFunctions::create_toolbar();
RMTemplate::get()->add_script('include/js/images.js');
RMTemplate::get()->add_script('include/js/jquery.validate.min.js');
Modified: RMC/rmcommon/trunk/rmcommon/include/js/images.js
===================================================================
--- RMC/rmcommon/trunk/rmcommon/include/js/images.js 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/include/js/images.js 2013-05-20 04:18:25 UTC (rev 11560)
@@ -29,11 +29,11 @@
$("#bar-indicator").html('100%');
$("#bar-indicator").animate({
width: '100%'
- }, 1000);
+ }, 300);
current = 0;
total = 0;
ids = new Array();
- $("div.donebutton").show('slow');
+ $("div.donebutton").fadeIn('fast');
return;
}
@@ -42,7 +42,7 @@
send_resize(ids[current], params);
$("#bar-indicator").animate({
width: percent*(current)+'%'
- }, 1000);
+ }, 300);
//$("#bar-indicator").css('width', percent*(current+1)+'%');
$("#bar-indicator").html(Math.round(percent*current+1)+'%');
current++;
@@ -51,12 +51,12 @@
function imgcontinue(){
$("#resizer-bar").hide('slow');
- $('.select_image_cat').show('slow');
- $('#upload-errors').show('slow');
- $('#upload-controls').show('slow');
+ $('.select_image_cat').fadeIn('fast');
+ $('#upload-errors').fadeIn('fast');
+ $('#upload-controls').fadeIn('fast');
$("#bar-indicator").html(0);
$("#bar-indicator").css('width','0px');
- $("#gen-thumbnails").hide('slow', function(){
+ $("#gen-thumbnails").fadeOut('fast', function(){
$("#gen-thumbnails").html('');
});
Modified: RMC/rmcommon/trunk/rmcommon/include/js/imgmanager.js
===================================================================
--- RMC/rmcommon/trunk/rmcommon/include/js/imgmanager.js 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/include/js/imgmanager.js 2013-05-20 04:18:25 UTC (rev 11560)
@@ -8,15 +8,16 @@
// --------------------------------------------------------------
$(document).ready(function(){
- $("#new-size-button").click(function(){
- var table = $("#sizes-container-all table:last");
- var id = table.attr("id").replace("table-single-size-",'');
+ $(".new-size-button").click(function(){
+ var table = $("#sizes-container-all .single-size:last");
+ var id = table.attr("id").replace("single-size-",'');
var newid = id; newid++;
var clone = table.clone();
- clone.attr("id", 'table-single-size-'+newid);
+ clone.attr("id", 'single-size-'+newid);
//var repl = "replace(/sizes\["+id+"\]/g, \"sizes["+newid+"]\");";
html = eval("clone.html().replace(/sizes\\["+id+"\\]/g, \"sizes["+newid+"]\");");
html = html.replace('delete-'+id, 'delete-'+newid);
+ html = html.replace(/value="*"/g, 'value=""');
clone.html(html);
clone.insertAfter(table);
clone.effect('highlight',{});
@@ -25,10 +26,13 @@
});
function delete_size(e){
- var id = $(e).attr("id").substring(7);
+
+ var id = $(e).attr("id").substring(7);
- var tables = $("#sizes-container-all table");
- if (tables.length<=1) return;
- $("table#table-single-size-"+id).remove();
+ var tables = $("#sizes-container-all .single-size");
+ if (tables.length<=1) return;
+ $("#single-size-"+id).remove();
+
+ return false;
}
\ No newline at end of file
Modified: RMC/rmcommon/trunk/rmcommon/lang/es.mo
===================================================================
(Binary files differ)
Modified: RMC/rmcommon/trunk/rmcommon/lang/es.po
===================================================================
--- RMC/rmcommon/trunk/rmcommon/lang/es.po 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/lang/es.po 2013-05-20 04:18:25 UTC (rev 11560)
@@ -6,7 +6,7 @@
"Project-Id-Version: XOOPS Modules\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-11-22 22:04-0600\n"
-"PO-Revision-Date: 2012-11-22 22:07-0600\n"
+"PO-Revision-Date: 2013-05-19 20:12-0600\n"
"Last-Translator: Eduardo Cortés <i.b...@gm...>\n"
"Language-Team: Spanish (Spain) (http://www.transifex.net/projects/p/xoops-"
"mods-i18n/language/es_ES/)\n"
@@ -764,7 +764,7 @@
#: C:\wamp\www\xm\modules\rmcommon/modules.php:685
#, php-format
msgid "Update log for %s"
-msgstr "Registro actualizado para %s"
+msgstr "Registro de actualización para %s"
#: C:\wamp\www\xm\modules\rmcommon/modules.php:716
#, php-format
@@ -1080,7 +1080,7 @@
#: C:\wamp\www\xm\modules\rmcommon/users.php:261
#: C:\wamp\www\xm\modules\rmcommon/templates/rmc_dashboard.php:74
msgid "Users Management"
-msgstr "Módulos Xoops"
+msgstr "Administración de Usuarios"
#: C:\wamp\www\xm\modules\rmcommon/users.php:251
#: C:\wamp\www\xm\modules\rmcommon/users.php:334
@@ -2296,7 +2296,7 @@
#: C:\wamp\www\xm\modules\rmcommon/templates/images_edit.php:2
msgid "Edit Image"
-msgstr "Editar Imágen"
+msgstr "Editar Imagen"
#: C:\wamp\www\xm\modules\rmcommon/templates/images_edit.php:20
msgid "Original Size"
@@ -2388,7 +2388,7 @@
#: C:\wamp\www\xm\modules\rmcommon/templates/images_uploadimages.php:5
msgid "Select Category:"
-msgstr "Seleccionar imágenes"
+msgstr "Seleccionar Categoría:"
#: C:\wamp\www\xm\modules\rmcommon/templates/images_uploadimages.php:12
msgid "Change Category"
Modified: RMC/rmcommon/trunk/rmcommon/modules.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/modules.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/modules.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -105,6 +105,8 @@
$available_mods = RMEvents::get()->run_event('rmcommon.available.modules', $available_mods);
$GLOBALS['available_mods'] = $available_mods;
+
+ RMBreadCrumb::get()->add_crumb(__('Modules Management','rmcommon'));
RMFunctions::create_toolbar();
RMTemplate::get()->assign('xoops_pagetitle', __('Modules Management','rmcommon'));
@@ -121,7 +123,7 @@
* This function show a resume of the changes that will be made by module
*/
function module_install(){
- global $xoopsSecurity;
+ global $xoopsSecurity, $rmTpl;
$dir = rmc_server_var($_GET,'dir','');
@@ -148,6 +150,12 @@
RMTEmplate::get()->add_script('include/js/modules.js');
RMTemplate::get()->add_style('modules.css', 'rmcommon');
RMFunctions::create_toolbar();
+
+ RMBreadCrumb::get()->add_crumb(__('Modules Management','rmcommon'), 'modules.php');
+ RMBreadCrumb::get()->add_crumb(sprintf(__('Install %s','rmcommon'), $module->getInfo('name')));
+
+ $rmTpl->assign('xoops_pagetitle', sprintf(__('Install %s','rmcommon'), $module->getInfo('name')));
+
xoops_cp_header();
include RMTemplate::get()->get_template('rmc_mod_preinstall.php', 'module', 'rmcommon');
@@ -211,7 +219,7 @@
function module_uninstall_now(){
- global $xoopsSecurity, $xoopsConfig;
+ global $xoopsSecurity, $xoopsConfig, $rmTpl;
$mod = rmc_server_var($_POST, 'module', '');
@@ -244,6 +252,12 @@
RMFunctions::create_toolbar();
RMTemplate::get()->add_style('modules.css', 'rmcommon');
+
+ RMBreadCrumb::get()->add_crumb(__('Modules Management','rmcommon'), 'modules.php');
+ RMBreadCrumb::get()->add_crumb(sprintf(__('%s install log','rmcommon'), $mod->getVar('name')));
+
+ $rmTpl->assign('xoops_pagetitle', sprintf(__('%s install log','rmcommon'), $mod->getVar('name')));
+
xoops_cp_header();
$module = new XoopsModule();
@@ -646,7 +660,7 @@
function module_update_now(){
- global $xoopsSecurity, $xoopsConfig;
+ global $xoopsSecurity, $xoopsConfig, $rmTpl;
$mod = rmc_server_var($_POST, 'module', '');
@@ -683,6 +697,12 @@
xoops_cp_header();
$log_title = sprintf(__('Update log for %s', 'rmcommon'), $module ? $module->getInfo('name') : $mod);
+
+ RMBreadCrumb::get()->add_crumb(__('Modules Management','rmcommon'), 'modules.php');
+ RMBreadCrumb::get()->add_crumb($log_title);
+
+ $rmTpl->assign('xoops_pagetitle', $log_title);
+
$action = rmc_server_var($_POST, 'action', '');
include RMTemplate::get()->get_template('rmc_mod_log.php','module','rmcommon');
Modified: RMC/rmcommon/trunk/rmcommon/plugins.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/plugins.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/plugins.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -45,7 +45,8 @@
}
function show_rm_plugins(){
-
+ global $rmTpl;
+
$path = RMCPATH.'/plugins';
$dir_list = XoopsLists::getDirListAsArray($path);
@@ -72,6 +73,10 @@
}
rm_reload_plugins();
+
+ RMBreadCrumb::get()->add_crumb(__('Plugins Manager','rmcommon'));
+
+ $rmTpl->assign('xoops_pagetitle', __('Plugins Manager','rmcommon'));
RMFunctions::create_toolbar();
xoops_cp_header();
@@ -218,7 +223,8 @@
}
function configure_rm_plugin(){
-
+ global $rmTpl;
+
$name = rmc_server_var($_GET, 'plugin', '');
if ($name==''){
redirectMsg('plugins.php', __('You must specify a existing plugin', 'rmcommon'), 1);
@@ -474,6 +480,12 @@
$form = RMEvents::get()->run_event("rmcommon.settings.form", $form, $plugin);
RMFunctions::create_toolbar();
+
+ RMBreadCrumb::get()->add_crumb(__('Plugins Manager','rmcommon'), 'plugins.php');
+ RMBreadCrumb::get()->add_crumb(__('Configure Plugin ','rmcommon'));
+
+ $rmTpl->assign('xoops_pagetitle', __('Configure Plugin ','rmcommon'));
+
xoops_cp_header();
$form->display();
xoops_cp_footer();
Modified: RMC/rmcommon/trunk/rmcommon/templates/categories_form.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/templates/categories_form.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/templates/categories_form.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -1,130 +1,120 @@
<h1 class="rmc_titles"><?php _e('Create New Category','rmcommon'); ?></h1>
-<form name="frmcats" id="img-cat-form" method="post" accept="images.php">
-<div class="form_container">
- <table class="table_form" cellspacing="0">
- <tr valign="top" class="cell_fields">
- <td class="form_captions">
- <label for="cat-name"><?php _e('Category Name:','rmcommon'); ?></label>
- </td>
- <td><input type="text" name="name" id="cat-name" value="<?php echo $edit ? $cat->getVar('name') : $name; ?>" class="required" size="50" />
- </tr>
- <tr valign="top" class="cell_fields">
- <td class="form_captions">
- <label for="cat-status"><?php _e('Category Status:','rmcommon'); ?></label>
- </td>
- <td>
- <label><input type="radio" name="status" id="cat-status" value="close"<?php echo $active!='open' ? ' checked="checked"' : ''; ?> /> <?php _e('Inactive','rmcommon'); ?></label>
- <label><input type="radio" name="status" id="cat-status" value="open"<?php echo $active=='open' ? ' checked="checked"' : ($edit ? '' : ' checked="checked"'); ?> /> <?php _e('Active','rmcommon'); ?></label>
- </td>
- </tr>
- <tr valign="top" class="cell_fields">
- <td class="form_captions">
- <label for="write[]"><?php _e('Groups that can upload images:','rmcommon'); ?></label>
- </td>
- <td>
+<form name="frmcats" id="img-cat-form" method="post" accept="images.php" class="form-horizontal">
+ <div class="form-container">
+
+ <div class="control-group">
+ <label for="cat-name" class="control-label"><?php _e('Category Name:','rmcommon'); ?></label>
+ <div class="controls">
+ <input type="text" name="name" id="cat-name" value="<?php echo $edit ? $cat->getVar('name') : $name; ?>" class="required" size="50" class="input-block-level" />
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label for="cat-status" class="control-label"><?php _e('Category Status:','rmcommon'); ?></label>
+ <div class="controls">
+ <label class="radio inline">
+ <input type="radio" name="status" id="cat-status" value="close"<?php echo $active!='open' ? ' checked="checked"' : ''; ?> /> <?php _e('Inactive','rmcommon'); ?>
+ </label>
+ <label class="radio inline">
+ <input type="radio" name="status" id="cat-status" value="open"<?php echo $active=='open' ? ' checked="checked"' : ($edit ? '' : ' checked="checked"'); ?> /> <?php _e('Active','rmcommon'); ?>
+ </label>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label for="write[]" class="control-label"><?php _e('Groups that can upload images:','rmcommon'); ?></label>
+ <div class="controls">
<?php echo $fwrite->render(); ?>
- </td>
- </tr>
- <tr valign="top" class="cell_fields">
- <td class="form_captions">
- <label for="read[]"><?php _e('Groups that can use this category:','rmcommon'); ?></label>
- </td>
- <td>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label for="read[]" class="control-label"><?php _e('Groups that can use this category:','rmcommon'); ?></label>
+ <div class="controls">
<?php echo $fread->render(); ?>
- </td>
- </tr>
- <tr class="cell_fields">
- <td class="form_captions">
- <label for="filesize"><?php _e('Maximum file size:','rmcommon'); ?></label>
- </td>
- <td>
- <input type="text" name="filesize" id="filesize" size="5" value="<?php echo $edit ? $cat->getVar('filesize') : '50'; ?>" />
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label for="filesize" class="control-label"><?php _e('Maximum file size:','rmcommon'); ?></label>
+ <div class="controls">
+ <input type="text" name="filesize" id="filesize" size="5" value="<?php echo $edit ? $cat->getVar('filesize') : '50'; ?>" class="input-mini" />
<select name="sizeunit">
<option value="1"<?php echo $edit && $cat->getVar('sizeunit')=='1' ? ' selected="selected"' : ''; ?>><?php _e('Bytes','rmcommon'); ?></option>
<option value="1024"<?php echo $edit && $cat->getVar('sizeunit')=='1024' ? ' selected="selected"' : (!$edit ? 'selected="selected"' : ''); ?>><?php _e('Kilobytes','rmcommon'); ?></option>
<option value="1048576"<?php echo $edit && $cat->getVar('sizeunit')=='1048576' ? ' selected="selected"' : ''; ?>><?php _e('Megabytes','rmcommon'); ?></option>
</select>
- </td>
- </tr>
- <tr>
- <td colspan="2"><h1 class=""><?php _e('Custom Sizes','rmcommon'); ?></h1></td>
- </tr>
- <tr>
- <td colspan="2" id="sizes-container-all">
-
- <?php _e('This configurations stablish the sizes in wich images will be created.','rmcommon'); ?>
+ </div>
+ </div>
+
+ <div class="page-header">
+ <h1><?php _e('Custom Sizes','rmcommon'); ?></h1>
+ <span class="muted">
+ <?php _e('This configurations stablish the sizes in wich images will be created.','rmcommon'); ?>
<?php _e('You can specify all sizes that you wish according to your needs.','rmcommon'); ?>
-
- <?php if($edit): ?>
- <?php $scounter = 0 ?>
- <?php foreach($cat->getVar('sizes') as $size): ?>
- <table class="outer sinlge_size" cellspacing="1" width="100%" id="table-single-size-<?php echo $scounter; ?>">
- <tr class="head">
- <td width="170"><?php _e('Size name','rmcommon'); ?></td>
- <td>
- <a href="javascript:;" class="delsize" id="delete-<?php echo $scounter; ?>" onclick="delete_size(this);"><?php _e('Delete','rmcommon'); ?></a>
- <?php _e('Images','rmcommon'); ?>
- </td>
- </tr>
- <tr class="even">
- <td rowspan="2" valign="top"><input type="text" name="sizes[<?php echo $scounter; ?>][name]" id="sizes[<?php echo $scounter; ?>][name]" value="<?php echo $size['name']; ?>" size="20" class="required" /></td>
- <td>
- <strong><?php _e('Width:','rmcommon'); ?></strong>
- <input type="text" name="sizes[<?php echo $scounter; ?>][width]" value="<?php echo $size['width']; ?>" size="5" />
- <strong><?php _e('Height:','rmcommon'); ?></strong>
- <input type="text" name="sizes[<?php echo $scounter; ?>][height]" value="<?php echo $size['height']; ?>" size="5" />
- </td>
- </tr>
- <tr class="even">
- <td colspan="2">
- <label><input type="radio" name="sizes[<?php echo $scounter; ?>][type]" value="scale"<?php echo $size['type']=='scale' ? ' checked="checked"' : ''; ?> /> <?php _e('Scale','rmcommon'); ?></label>
- <label><input type="radio" name="sizes[<?php echo $scounter; ?>][type]" value="crop"<?php echo $size['type']=='crop' ? ' checked="checked"' : ''; ?> /> <?php _e('Crop','rmcommon'); ?></label>
- <label><input type="radio" name="sizes[<?php echo $scounter; ?>][type]" value="none"<?php echo $size['type']=='none' ? ' checked="checked"' : ''; ?> /> <?php _e('No Resize','rmcommon'); ?></label>
- </td>
- </tr>
- </table>
- <?php $scounter++; ?>
- <?php endforeach; ?>
- <?php else: ?>
- <table class="outer sinlge_size" cellspacing="1" width="100%" id="table-single-size-0">
- <tr class="head">
- <td width="170"><?php _e('Size name','rmcommon'); ?></td>
- <td>
- <a href="javascript:;" class="delsize" id="delete-0" onclick="delete_size(this);"><?php _e('Delete','rmcommon'); ?></a>
- <?php _e('Images','rmcommon'); ?>
- </td>
- </tr>
- <tr class="even">
- <td rowspan="2" valign="top"><input type="text" name="sizes[0][name]" id="sizes[0][name]" value="" size="20" class="required" /></td>
- <td>
- <strong><?php _e('Width:','rmcommon'); ?></strong>
- <input type="text" name="sizes[0][width]" value="" size="5" />
- <strong><?php _e('Height:','rmcommon'); ?></strong>
- <input type="text" name="sizes[0][height]" value="" size="5" />
- </td>
- </tr>
- <tr class="even">
- <td colspan="2">
- <label><input type="radio" name="sizes[0][type]" value="scale" /> <?php _e('Scale','rmcommon'); ?></label>
- <label><input type="radio" name="sizes[0][type]" value="crop" /> <?php _e('Crop','rmcommon'); ?></label>
- <label><input type="radio" name="sizes[0][type]" value="none" checked="checked" /> <?php _e('No Resize','rmcommon'); ?></label>
- </td>
- </tr>
- </table>
- <?php endif; ?>
- <div class="new_container"><input type="button" value="<?php _e('New Size','rmcommon'); ?>" id="new-size-button" /></div>
-
- </td>
- </tr>
- <tr class="cell_fields">
- <td align="left" colspan="2">
- <input type="submit" value="<?php _e($edit ? 'Update Category' : 'Create Category','rmcommon'); ?>" class="button" />
- <input type="button" value="<?php _e('Cancel','rmcommon'); ?>" onclick="window.location = 'images.php?action=showcats';" />
- </td>
- </tr>
- </table>
- <!-- /Form Table -->
-</div>
-<input type="hidden" name="action" value="<?php echo $edit ? 'saveedit' : 'save'; ?>" />
-<?php if($edit): ?><input type="hidden" name="id" value="<?php echo $cat->id(); ?>" /><?php endif; ?>
+ </span>
+ </div>
+
+ <div id="sizes-container-all">
+
+ <div class="new-container">
+ <button type="button" class="btn btn-info new-size-button"><i class="icon-plus"></i> <?php _e('Add New Size','rmcommon'); ?></button>
+ </div>
+
+ <?php if($edit): ?>
+ <?php $scounter = 0 ?>
+ <?php foreach($cat->getVar('sizes') as $size): ?>
+ <div class="single-size" id="single-size-<?php echo $scounter; ?>">
+ <label><?php _e('Size name','rmcommon'); ?></label>
+ <input type="text" name="sizes[<?php echo $scounter; ?>][name]" id="sizes[<?php echo $scounter; ?>][name]" value="<?php echo $size['name']; ?>" size="20" class="required input-block-level" />
+ <label><?php _e('Width:','rmcommon'); ?></label>
+ <input type="text" name="sizes[<?php echo $scounter; ?>][width]" value="<?php echo $size['width']; ?>" size="5" class="input-block-level" />
+ <label><?php _e('Height:','rmcommon'); ?></label>
+ <input type="text" name="sizes[<?php echo $scounter; ?>][height]" value="<?php echo $size['height']; ?>" size="5" class="input-block-level" />
+
+ <label class="radio"><input type="radio" name="sizes[<?php echo $scounter; ?>][type]" value="scale"<?php echo $size['type']=='scale' ? ' checked="checked"' : ''; ?> /> <?php _e('Scale','rmcommon'); ?></label>
+ <label class="radio"><input type="radio" name="sizes[<?php echo $scounter; ?>][type]" value="crop"<?php echo $size['type']=='crop' ? ' checked="checked"' : ''; ?> /> <?php _e('Crop','rmcommon'); ?></label>
+ <label class="radio"><input type="radio" name="sizes[<?php echo $scounter; ?>][type]" value="none"<?php echo $size['type']=='none' ? ' checked="checked"' : ''; ?> /> <?php _e('No Resize','rmcommon'); ?></label>
+
+ <div class="form-actions">
+ <a href="#" class="btn btn-danger" id="delete-<?php echo $scounter; ?>" onclick="return delete_size(this);"><i class="icon-remove"></i> <?php _e('Delete','rmcommon'); ?></a>
+ </div>
+ </div>
+ <?php $scounter++; ?>
+ <?php endforeach; ?>
+ <?php else: ?>
+
+ <div class="single-size" id="single-size-0">
+ <label><?php _e('Size name','rmcommon'); ?></label>
+ <input type="text" name="sizes[0][name]" id="sizes[0][name]" size="20" class="required input-block-level" placeholder="<?php _e('e.g. thumbnail','rmcommon'); ?>" />
+ <label><?php _e('Width:','rmcommon'); ?></label>
+ <input type="text" name="sizes[0][width]" size="5" class="input-block-level" placeholder="<?php _e('e.g. 150','rmcommon'); ?>" />
+ <label><?php _e('Height:','rmcommon'); ?></label>
+ <input type="text" name="sizes[0][height]" size="5" class="input-block-level" placeholder="<?php _e('e.g. 150','rmcommon'); ?>" />
+
+ <label class="radio"><input type="radio" name="sizes[0][type]" value="scale" checked="checked" /> <?php _e('Scale','rmcommon'); ?></label>
+ <label class="radio"><input type="radio" name="sizes[0][type]" value="crop" /> <?php _e('Crop','rmcommon'); ?></label>
+ <label class="radio"><input type="radio" name="sizes[0][type]" value="none" /> <?php _e('No Resize','rmcommon'); ?></label>
+
+ <div class="form-actions">
+ <a href="#" class="btn btn-danger" id="delete-0" onclick="return delete_size(this);"><i class="icon-remove"></i> <?php _e('Delete','rmcommon'); ?></a>
+ </div>
+ </div>
+
+ <?php endif; ?>
+
+ <div class="new-container">
+ <button type="button" class="btn btn-info new-size-button"><i class="icon-plus"></i> <?php _e('Add New Size','rmcommon'); ?></button>
+ </div>
+
+ </div>
+
+ <div class="cat-buttons">
+ <button type="submit" class="btn btn-primary btn-large"><?php _e($edit ? 'Update Category' : 'Create Category','rmcommon'); ?></button>
+ <button type="button" class="btn btn-warning btn-large" onclick="window.location = 'images.php?action=showcats';"><?php _e('Cancel','rmcommon'); ?></button>
+ </div>
+
+ </div>
+ <input type="hidden" name="action" value="<?php echo $edit ? 'saveedit' : 'save'; ?>" />
+ <?php if($edit): ?><input type="hidden" name="id" value="<?php echo $cat->id(); ?>" /><?php endif; ?>
</form>
\ No newline at end of file
Modified: RMC/rmcommon/trunk/rmcommon/templates/images_categories.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/templates/images_categories.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/templates/images_categories.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -1,6 +1,6 @@
<h1 class="rmc_titles"><?php _e('Categories','rmcommon'); ?></h1>
-<form name="frmimgcats" id="form-img-cats" method="post" action="images.php">
+<form name="frmimgcats" id="form-img-cats" method="post" action="images.php" class="form-inline">
<div class="rmc_bulkactions">
<?php echo $nav->render(); ?>
<select name="action">
Modified: RMC/rmcommon/trunk/rmcommon/templates/images_edit.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/templates/images_edit.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/templates/images_edit.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -1,53 +1,80 @@
<?php RMTemplate::get()->add_head('<script type="text/javascript">$(document).ready(function(){$("#frmupdimg").validate();});</script>'); ?>
<h1 class="rmc_titles"><?php _e('Edit Image','rmcommon'); ?></h1>
-<form name="frmupdimg" id="frmupdimg" method="post" action="images.php">
-<table cellpadding="0" cellspacing="0" width="90%" class="" align="center">
- <tr class="odd">
- <td rowspan="4" width="25%"><img src="<?php echo $image_data['thumbnail']; ?>" alt="" style="max-width: 150px; max-height: 100px;" /></td>
- <td><?php echo $image_data['file']; ?></td>
- </tr>
- <tr class="odd">
- <td><?php echo $image_data['mime']; ?></td>
- </tr>
- <tr class="odd">
- <td><?php echo formatTimestamp($image_data['date'], 'l'); ?></td>
- </tr>
- <tr class="odd">
- <td>
- <?php foreach($image_data['sizes'] as $size): ?>
- <a href="javascript:;" onclick="show_image_pop('<?php echo $size['file']; ?>');"><?php echo $size['name']; ?></a> |
- <?php endforeach; ?>
- <a href="javascript:;" onclick="show_image_pop('<?php echo $image_data['url']; ?>');"><?php _e('Original Size','rmcommon'); ?></a>
- </td>
- </tr>
- <tr class="even">
- <td class="head">*<?php _e('Title:', 'rmcommon'); ?></td>
- <td><input name="title" type="text" value="<?php echo $image_data['title']; ?>" size="50" class="required" /></td>
- </tr>
- <tr class="odd">
- <td class="head"><?php _e('Category:','rmcommon'); ?></td>
- <td>
- <select name="cat">
- <?php foreach($categories as $catego): ?>
- <option value="<?php echo $catego['id']; ?>"<?php echo $catego['id']==$cat->id() ? ' selected="selected"' : ''; ?>><?php echo $catego['name']; ?></option>
- <?php endforeach; ?>
- </select>
- </td>
- </tr>
- <tr class="even" valign="top">
- <td class="head"><?php _e('Description:','rmcommon'); ?></td>
- <td><textarea name="desc" style="width: 80%; height: 100px;"><?php echo $image_data['desc']; ?></textarea></td>
- </tr>
- <tr class="foot">
- <td colspan="2">
- <input type="submit" value="<?php _e('Update Image!','rmcommon'); ?>" />
- <input type="button" value="<?php _e('Cancel','rmcommon'); ?>" onclick="window.location = 'images.php?category=<?php echo $cat->id(); ?>&page=<?php echo $page; ?>';" />
- </td>
- </tr>
-</table>
-<input type="hidden" name="action" value="update" />
-<input type="hidden" name="id" value="<?php echo $id; ?>" />
-<input type="hidden" name="page" value="<?php echo $page; ?>" />
-<input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<?php echo $xoopsSecurity->createToken(); ?>" />
-</form>
+
+<div class="row-fluid">
+ <div class="span10">
+ <form name="frmupdimg" id="frmupdimg" method="post" action="images.php" class="form-horizontal">
+
+ <div class="control-group">
+ <label class="control-label"><?php _e('File:','rmcommon'); ?></label>
+ <div class="controls">
+ <span class="uneditable-input input-block-level"><?php echo $image_data['file']; ?></span>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label"><?php _e('Image data:','rmcommon'); ?></label>
+ <div class="controls">
+ <span class="label"><?php echo $image_data['mime']; ?></span>
+ <span class="label"><?php echo formatTimestamp($image_data['date'], 'c'); ?></span>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label"><?php _e('Available sizes:','rmcommon'); ?></label>
+ <div class="controls">
+ <?php foreach($image_data['sizes'] as $size): ?>
+ <a href="<?php echo $size['file']; ?>" class="btn"><?php echo $size['name']; ?></a>
+ <?php endforeach; ?>
+ <a href="<?php echo $image_data['url']; ?>" class="btn btn-info"><?php _e('Original Size','rmcommon'); ?></a>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label">*<?php _e('Title:', 'rmcommon'); ?></label>
+ <div class="controls">
+ <input name="title" type="text" value="<?php echo $image_data['title']; ?>" size="50" class="required input-block-level" />
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label"><?php _e('Category:','rmcommon'); ?></label>
+ <div class="controls">
+ <select name="cat">
+ <?php foreach($categories as $catego): ?>
+ <option value="<?php echo $catego['id']; ?>"<?php echo $catego['id']==$cat->id() ? ' selected="selected"' : ''; ?>><?php echo $catego['name']; ?></option>
+ <?php endforeach; ?>
+ </select>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label"><?php _e('Description:','rmcommon'); ?></label>
+ <div class="controls">
+ <textarea name="desc" class="input-block-level"><?php echo $image_data['desc']; ?></textarea>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <div class="controls">
+ <button type="submit" class="btn btn-primary btn-large"><?php _e('Update Image!','rmcommon'); ?></button>
+ <button type="button" class="btn btn-warning btn-large" onclick="window.location = 'images.php?category=<?php echo $cat->id(); ?>&page=<?php echo $page; ?>';"><?php _e('Cancel','rmcommon'); ?></button>
+ </div>
+ </div>
+
+ <?php echo $rmEvents->run_event('rmcommon.image.edit.form'); ?>
+
+ <input type="hidden" name="action" value="update" />
+ <input type="hidden" name="id" value="<?php echo $id; ?>" />
+ <input type="hidden" name="page" value="<?php echo $page; ?>" />
+ <input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<?php echo $xoopsSecurity->createToken(); ?>" />
+ </form>
+ </div>
+
+ <div class="span2">
+ <img src="<?php echo $image_data['thumbnail']; ?>" alt="" />
+ </div>
+
+</div>
+
<div id="image-loader"></div>
\ No newline at end of file
Modified: RMC/rmcommon/trunk/rmcommon/templates/images_images.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/templates/images_images.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/templates/images_images.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -1,7 +1,7 @@
<h1 class="rmc_titles"><?php _e('Images Manager','rmcommon'); echo ': '.$category->getVar('name'); ?></h1>
-<form name="list_images" method="post" action="images.php" id="list-images">
+<form name="list_images" method="post" action="images.php" id="list-images" class="form-inline">
<div class="rmc_bulkactions">
-<?php echo $nav->display(); ?>
+<div class="pull-right"><?php echo $nav->display(false); ?></div>
<select name="action" id="action-select">
<option value=""><?php _e('Bulk Actions...','rmcommon'); ?></option>
<option value="delete"><?php _e('Delete','rmcommon'); ?></option>
Modified: RMC/rmcommon/trunk/rmcommon/templates/images_uploadimages.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/templates/images_uploadimages.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/templates/images_uploadimages.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -1,7 +1,7 @@
<?php if(!$isupdate): ?>
<h1 class="rmc_titles"><?php _e('Upload Images','rmcommon'); ?></h1>
<div class="select_image_cat">
- <form name="frmcat" method="get" action="images.php">
+ <form name="frmcat" method="get" action="images.php" class="form-inline">
<?php _e('Select Category:','rmcommon'); ?>
<select name="category">
<option value=""><?php _e('Select...','rmcommon'); ?></option>
@@ -9,15 +9,17 @@
<option value="<?php echo $category['id']; ?>"<?php echo $cat->id()==$category['id'] ? ' selected="selected"' : '' ?>><?php echo $category['name']; ?></option>
<?php endforeach; ?>
</select>
- <input type="submit" value="<?php _e('Change Category','rmcommon'); ?>" />
- <input type="button" value="<?php _e('Cancel','rmcommon'); ?>" onclick="window.location= 'images.php?action=showcats';" />
+ <button type="submit" class="btn btn-info"><?php _e('Change Category','rmcommon'); ?></button>
+ <button type="button" class="btn"><?php _e('Cancel','rmcommon'); ?></button>
<input type="hidden" name="action" value="new" />
</form>
</div>
<?php if (!$cat->isNew()): ?>
+<div class="row-fluid">
+ <button type="button" class="btn btn-success" onclick="$('#files-container').uploadifyUpload();"><?php _e('Upload','rmcommon'); ?></button>
+ <button type="button" class="btn btn-warning" onclick="$('#files-container').uploadifyClearQueue(); $('#upload-errors').html('');"><?php _e('Clear All','rmcommon'); ?></button>
+</div><br>
<div id="upload-controls">
- <input type="button" class="formButton imgcontrols" style="margin-right: 5px;" onclick="$('#files-container').uploadifyUpload();" value="<?php _e('Upload','rmcommon'); ?>" />
- <input type="button" class="imgcontrols" style="margin-right: 5px;" onclick="$('#files-container').uploadifyClearQueue(); $('#upload-errors').html('');" value="<?php _e('Clear All','rmcommon'); ?>" />
<div id="upload-errors">
</div>
@@ -30,13 +32,15 @@
<div id="resizer-bar">
<span class="message"></span>
<strong><?php _e('Resizing images','rmcommon'); ?></strong>
-<div class="thebar">
-<div class="indicator" id="bar-indicator">0</div>
+<div class="progress progress-striped active thebar">
+<div class="bar indicator" id="bar-indicator">0</div>
</div>
<span><?php _e('Please, do not close the window until resizing process has finished!','rmcommon'); ?></span>
<div class="donebutton">
- <?php if(!$isupdate): ?><input type="button" class="donebutton" value="<?php _e('Done! Click to continue...','rmcommon'); ?>" onclick="imgcontinue();" /><?php endif; ?>
- <input type="button" class="" value="<?php _e('Done! Show images...','rmcommon'); ?>" onclick="window.location = 'images.php?category=<?php echo $cat->id(); ?>';" />
+ <?php if(!$isupdate): ?>
+ <button type="button" class="btn btn-warning donebutton" onclick="imgcontinue();"><?php _e('Done! Click to continue...','rmcommon'); ?></button>
+ <?php endif; ?>
+ <button type="button" class="btn btn-info" onclick="window.location = 'images.php?category=<?php echo $cat->id(); ?>';"><?php _e('Done! Show images...','rmcommon'); ?></button>
</div>
</div>
<div id="gen-thumbnails"></div>
Modified: RMC/rmcommon/trunk/rmcommon/templates/rmc_comments.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/templates/rmc_comments.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/templates/rmc_comments.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -1,5 +1,5 @@
-<div class="comments_search">
- <form name="search_form" method="get" action="comments.php">
+<div class="row-fluid">
+ <form name="search_form" class="form-inline pull-right" method="get" action="comments.php">
<?php _e('Search:','rmcommon'); ?>
<input type="text" name="w" id="wsearch" value="<?php echo isset($keyw) ? $keyw : '' ?>" size="20" />
<input type="button" value="<?php _e('Apply','rmcommon'); ?>" onclick="$('#wsearch').val()==''?alert('<?php _e('You need something to search!','rmcommon'); ?>'):submit();" />
@@ -7,34 +7,32 @@
</form>
</div>
<h1 class="rmc_titles"><?php _e('Comments Manager','rmcommon'); ?></h1>
-<form name="list_comments" method="post" action="comments.php" id="list-comments">
-<div class="rmc_bulkactions">
-<?php $nav->display(false, true); ?>
-<select name="action" id="action-select" onchange="$('#action-select2').val($(this).val());">
- <option value="" selected="selected"><?php _e('Bulk Actions...','rmcommon'); ?></option>
- <option value="unapprove"><?php _e('Set unapproved','rmcommon'); ?></option>
- <option value="approve"><?php _e('Set approved','rmcommon'); ?></option>
- <option value="spam"><?php _e('Mark as SPAM','rmcommon'); ?></option>
- <option value="delete"><?php _e('Delete comments','rmcommon'); ?></option>
-</select>
-<input type="submit" value="<?php _e('Apply','rmcommon'); ?>" onclick="if($('#action-select').val()=='delete') return confirm('Do you really want to delete selected comments?');" />
-<a href="comments.php"><?php _e('View all','rmcommon'); ?></a> |
-<?php if($filter=='waiting'): ?>
-<strong><?php _e('Unapproved','rmcommon'); ?></strong> |
-<?php else: ?>
-<a href="comments.php?filter=waiting"><?php _e('Unapproved','rmcommon'); ?></a> |
-<?php endif; ?>
-<?php if($filter=='approved'): ?>
-<strong><?php _e('Approved','rmcommon'); ?></strong>
-<?php else: ?>
-<a href="comments.php?filter=approved"><?php _e('Approved','rmcommon'); ?></a>
-<?php endif; ?>
-|
-<?php if($filter=='spam'): ?>
-<strong><?php _e('SPAM','rmcommon'); ?></strong>
-<?php else: ?>
-<a href="comments.php?filter=spam"><?php _e('SPAM','rmcommon'); ?></a>
-<?php endif; ?>
+<form name="list_comments" method="post" action="comments.php" id="list-comments" class="form-inline">
+<div class="row-fluid rmc_bulkactions">
+ <?php $nav->display(false, true); ?>
+ <select name="action" id="action-select" onchange="$('#action-select2').val($(this).val());">
+ <option value="" selected="selected"><?php _e('Bulk Actions...','rmcommon'); ?></option>
+ <option value="unapprove"><?php _e('Set unapproved','rmcommon'); ?></option>
+ <option value="approve"><?php _e('Set approved','rmcommon'); ?></option>
+ <option value="spam"><?php _e('Mark as SPAM','rmcommon'); ?></option>
+ <option value="delete"><?php _e('Delete comments','rmcommon'); ?></option>
+ </select>
+ <button type="submit" class="btn btn-info" onclick="if($('#action-select').val()=='delete') return confirm('Do you really want to delete selected comments?');"><?php _e('Apply','rmcommon'); ?></button>
+
+ <ul class="nav nav-pills pull-right">
+ <li<?php if($filter==''): ?> class="active"<?php endif; ?>>
+ <a href="comments.php"><?php _e('View all','rmcommon'); ?></a>
+ </li>
+ <li<?php if($filter=='waiting'): ?> class="active"<?php endif; ?>>
+ <a href="comments.php?filter=waiting"><?php _e('Unapproved','rmcommon'); ?></a>
+ </li>
+ <li<?php if($filter=='approved'): ?> class="active"<?php endif; ?>>
+ <a href="comments.php?filter=approved"><?php _e('Approved','rmcommon'); ?></a>
+ </li>
+ <li<?php if($filter=='spam'): ?> class="active"<?php endif; ?>>
+ <a href="comments.php?filter=spam"><?php _e('SPAM','rmcommon'); ?></a>
+ </li>
+ </ul>
</div>
<table class="outer" cellspacing="0" width="100%">
<thead>
@@ -119,7 +117,7 @@
<option value="approve"><?php _e('Set approved','rmcommon'); ?></option>
<option value="delete"><?php _e('Delete comments','rmcommon'); ?></option>
</select>
-<input type="submit" value="<?php _e('Apply','rmcommon'); ?>" onclick="if($('#action-select').val()=='delete') return confirm('Do you really want to delete selected comments?');" />
+<button type="submit" onclick="if($('#action-select').val()=='delete') return confirm('Do you really want to delete selected comments?');" class="btn btn-info"><?php _e('Apply','rmcommon'); ?></button>
</div>
<input type="hidden" name="filter" value="<?php echo $filter; ?>" />
<input type="hidden" name="w" value="<?php echo $keyw; ?>" />
Modified: RMC/rmcommon/trunk/rmcommon/templates/rmc_plugins.php
===================================================================
--- RMC/rmcommon/trunk/rmcommon/templates/rmc_plugins.php 2013-05-19 14:35:55 UTC (rev 11559)
+++ RMC/rmcommon/trunk/rmcommon/templates/rmc_plugins.php 2013-05-20 04:18:25 UTC (rev 11560)
@@ -1,127 +1,143 @@
<h1 class="rmc_titles"><?php _e('Plugins Manager','rmcommon'); ?></h1>
-<div class="descriptions">
-<?php _e('Plugins allows to Common Utilities to improve its features and capabilities. Following is a list with existing plugins, installed and available to install.','rmcommon'); ?>
-</div>
-<h3><?php _e('Installed Plugins', 'rmcommon'); ?></h3>
-<table class="outer" cellspacing="0" cellpadding="0">
- <thead>
- <tr>
- <th align="left"><?php _e('Name','rmcommon'); ?></th>
- <th align="left"><?php _e('Description', 'rmcommon'); ?></th>
- <th><?php _e('Version','rmcommon'); ?></th>
- <th><?php _e('Author','rmcommon'); ?></th>
- <th><?php _e('Status','rmcommon'); ?></th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <th align="left"><?php _e('Name','rmcommon'); ?></th>
- <th align="left"><?php _e('Description', 'rmcommon'); ?></th>
- <th><?php _e('Version','rmcommon'); ?></th>
- <th><?php _e('Author','rmcommon'); ?></th>
- <th><?php _e('Status','rmcommon'); ?></th>
- </tr>
- </tfoot>
- <tbody>
- <?php if(empty($installed_plugins)): ?>
- <tr class="even">
- <td class="error" colspan="5" align="center"><?php _e('There are not plugins installed yet!','rmcommon'); ?></td>
- </tr>
- <?php endif; ?>
- <?php foreach ($installed_plugins as $plugin): ?>
- <tr class="<?php echo tpl_cycle("even,odd"); ?>" valign="top">
- <td>
- <?php if($plugin->get_info('hasmain')): ?>
- <strong><a href="plugins.php?p=<?php echo $plugin->get_info('dir'); ?>"><?php echo $plugin->getVar('name'); ?></a></strong>
- <?php else: ?>
- <strong><?php echo $plugin->getVar('name'); ?></strong>
- <?php endif; ?>
- <span class="rmc_options">
- <a href="plugins.php?action=uninstall&plugin=<?php echo $plugin->get_info('dir'); ?>"><?php _e('Uninstall','rmcommon'); ?></a> |
- <?php if($plugin->getVar('status')): ?>
- <a href="plugins.php?action=disable&plugin=<?php echo $plugin->get_info('dir'); ?>"><?php _e('Disable','rmcommon'); ?></a> |
- <?php else: ?>
- <a href="plugins.php?action=enable&plugin=<?php echo $plugin->get_info('dir'); ?>"><?php _e('Enable','rmcommon'); ?></a> |
- <?php endif; ?>
- <a href="plugins.php?action=update&plugin=<?php echo $plugin->get_info('dir'); ?>"><?php _e('Update','rmcommon'); ?></a>
- <?php if($plugin->options()): ?>
- | <a href="plugins.php?action=configure&plugin=<?php echo $plugin->get_info('dir'); ?>"><?php _e('Settings','rmcommon'); ?></a>
- <?php endif; ?>
+<ul class="nav nav-tabs plugins-nav">
+ <li class="active"><a href="#plugins-installed" data-toggle="tab"><?php _e('Installed Plugins','rmcommon'); ?></a></li>
+ <li><a href="#plugins-noinstalled" data-toggle="tab"><?php _e('Available Plugins','rmcommon'); ?></a></li>
+</ul>
+
+<div class="tab-content">
+ <div class="page-header" style="margin: 0 0 5px 0;">
+ <span class="muted">
+ <?php _e('Plugins allows to Common Utilities to improve its features and capabilities. Following is a list with existing plugins, installed and available to install.','rmcommon'); ?>
+ </span>
+ </div>
+ <div class="tab-pane active" id="plugins-installed">
+
+ <h3><?php _e('Installed Plugins', 'rmcommon'); ?></h3>
+
+ <table class="outer" cellspacing="0" cellpadding="0">
+ <thead>
+ <tr>
+ <th align="left"><?php _e('Name','rmcommon'); ?></th>
+ <th align="left"><?php _e('Description', 'rmcommon'); ?></th>
+ <th><?php _e('Version','rmcommon'); ?></th>
+ <th><?php _e('Author','rmcommon'); ?></th>
+ <th><?php _e('Status','rmcommon'); ?></th>
+ </tr>
+ ...
[truncated message content] |