aboutsummaryrefslogtreecommitdiffstats
path: root/admin/themes
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2011-04-27 21:59:46 +0000
committermistic100 <mistic@piwigo.org>2011-04-27 21:59:46 +0000
commit9a15f40a8554bcb2695007eb1af60ae2e2706d4c (patch)
treeeb4c17f85e68f65451f87fe670b841a0da7501a6 /admin/themes
parenta843760442133882060d35fb7829e48a6f7147a1 (diff)
feature:2269 merge r10648&r10649 from trunk
git-svn-id: http://piwigo.org/svn/branches/2.2@10650 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes')
-rw-r--r--admin/themes/default/template/batch_manager_unit.tpl10
-rw-r--r--admin/themes/default/template/include/colorbox.inc.tpl2
-rw-r--r--admin/themes/default/theme.css3
3 files changed, 12 insertions, 3 deletions
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index e8b50a85c..9a1dde834 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -1,6 +1,6 @@
-
{include file='include/autosize.inc.tpl'}
{include file='include/datepicker.inc.tpl'}
+{include file='include/colorbox.inc.tpl'}
{combine_script id='jquery.fcbkcomplete' load='async' require='jquery' path='themes/default/js/plugins/jquery.fcbkcomplete.js'}
{footer_script require='jquery.fcbkcomplete'}
@@ -25,6 +25,8 @@ jQuery(document).ready(function() {
maxitems: 100,
newel: true
});
+
+ $("a.preview-box").colorbox();
});
{/literal}{/footer_script}
@@ -50,7 +52,11 @@ jQuery(document).ready(function() {
<fieldset class="elementEdit">
<legend>{$element.LEGEND}</legend>
- <a href="{$element.U_EDIT}"><img src="{$element.TN_SRC}" alt="" title="{'Edit photo information'|@translate}"></a>
+ <span class="thumb">
+ <a href="{$element.FILE_SRC}" class="preview-box" title="{$element.LEGEND}"><img src="{$element.TN_SRC}" alt=""></a>
+ <br/>
+ <a href="{$element.U_EDIT}">{'Informations'|@translate}</a>
+ </span>
<table>
diff --git a/admin/themes/default/template/include/colorbox.inc.tpl b/admin/themes/default/template/include/colorbox.inc.tpl
new file mode 100644
index 000000000..c6dc52138
--- /dev/null
+++ b/admin/themes/default/template/include/colorbox.inc.tpl
@@ -0,0 +1,2 @@
+{combine_script id='jquery.colorbox' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js'}
+{combine_css path="themes/default/js/plugins/jquery.colorbox.css"} \ No newline at end of file
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index bb645c256..e3cab2eff 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -215,9 +215,10 @@ LI.menuLi {
FORM#catModify TABLE { width: auto; }
-FIELDSET.elementEdit A {
+FIELDSET.elementEdit .thumb {
display: block;
float: right;
+ text-align: center;
}
TABLE.doubleSelect {