aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-08-18 16:51:16 +0000
committerplegall <plg@piwigo.org>2011-08-18 16:51:16 +0000
commit50cb55c65690f15b5bbc375af0b2bfa87400083d (patch)
tree9e3d6af495023f02dcc5eceb7214e62c61e5636c /admin
parent27d0c89c337ee5a2281640d0fed68ed26c0a50e1 (diff)
feature 2409 added: by default, hide the "who can see these photos?" field in the upload form.
git-svn-id: http://piwigo.org/svn/trunk@11967 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl37
-rw-r--r--admin/themes/default/theme.css4
2 files changed, 26 insertions, 15 deletions
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 9ee4a8595..41b19f51d 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -147,6 +147,11 @@ jQuery(document).ready(function(){
jQuery("#uploadWarnings").show();
});
+ jQuery("#showPermissions").click(function() {
+ jQuery(this).parent(".showFieldset").hide();
+ jQuery("#permissions").show();
+ });
+
{/literal}
{if $upload_mode eq 'html'}
{literal}
@@ -386,14 +391,6 @@ var sizeLimit = {$upload_max_filesize};
</fieldset>
<fieldset>
- <legend>{'Who can see these photos?'|@translate}</legend>
-
- <select name="level" size="1">
- {html_options options=$level_options selected=$level_options_selected}
- </select>
- </fieldset>
-
- <fieldset>
<legend>{'Select files'|@translate}</legend>
<p id="uploadWarningsSummary">{$upload_max_filesize_shorthand}B. {$upload_file_types}. {if isset($max_upload_resolution)}{$max_upload_resolution}Mpx{/if} <a class="showInfo" title="{'Learn more'|@translate}">i</a></p>
@@ -413,14 +410,9 @@ var sizeLimit = {$upload_max_filesize};
</div>
<p id="uploadModeInfos">{'You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'|@translate|@sprintf:$switch_url}</p>
-
- </fieldset>
- <p>
- <input class="submit" type="submit" name="submit_upload" value="{'Start Upload'|@translate}">
- </p>
{elseif $upload_mode eq 'multiple'}
-
+
<p>
<input type="file" name="uploadify" id="uploadify">
</p>
@@ -429,7 +421,24 @@ var sizeLimit = {$upload_max_filesize};
<p id="uploadModeInfos">{'You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'|@translate|@sprintf:$switch_url}</p>
+{/if}
+ </fieldset>
+
+ <p class="showFieldset"><a id="showPermissions" href="#">{'Manage Permissions'|@translate}</a></p>
+
+ <fieldset id="permissions" style="display:none">
+ <legend>{'Who can see these photos?'|@translate}</legend>
+
+ <select name="level" size="1">
+ {html_options options=$level_options selected=$level_options_selected}
+ </select>
</fieldset>
+
+{if $upload_mode eq 'html'}
+ <p>
+ <input class="submit" type="submit" name="submit_upload" value="{'Start Upload'|@translate}">
+ </p>
+{elseif $upload_mode eq 'multiple'}
<p>
<input class="submit" type="button" value="{'Start Upload'|@translate}">
<input type="submit" name="submit_upload" style="display:none">
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index ff99ff8f7..84e1e2518 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1069,4 +1069,6 @@ div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-co
p#uploadWarningsSummary {text-align:left;margin-bottom:1em;font-size:90%;color:#999;}
p#uploadWarningsSummary .showInfo {position:static;display:inline;padding:1px 6px;margin-left:3px;}
p#uploadWarnings {display:none;text-align:left;margin-bottom:1em;font-size:90%;color:#999;}
-p#uploadModeInfos {text-align:left;margin-top:1em;font-size:90%;color:#999;} \ No newline at end of file
+p#uploadModeInfos {text-align:left;margin-top:1em;font-size:90%;color:#999;}
+
+#photosAddContent p.showFieldset {text-align:left;margin: 0 auto 10px auto;width: 650px;} \ No newline at end of file