summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/center_list_galleries.php2
-rw-r--r--templates/edit_image.tpl2
-rw-r--r--templates/gallery_nav.tpl8
-rw-r--r--templates/image_order.tpl44
-rw-r--r--templates/list_galleries.tpl3
-rw-r--r--templates/upload_fisheye.tpl28
-rw-r--r--templates/view_image.tpl15
7 files changed, 66 insertions, 36 deletions
diff --git a/templates/center_list_galleries.php b/templates/center_list_galleries.php
index d5c3975..cc3641e 100644
--- a/templates/center_list_galleries.php
+++ b/templates/center_list_galleries.php
@@ -6,7 +6,7 @@
$_REQUEST['root_only'] = TRUE;
$_REQUEST['get_thumbnails'] = TRUE;
$galleryList = $gFisheyeGallery->getList( $_REQUEST );
- $gBitSmarty->assign_by_ref('galleryList', $galleryList);
+ $gBitSmarty->assign_by_ref( 'galleryList', $galleryList['data'] );
/* Process the input parameters this page accepts */
if (!empty($gQueryUser) && $gQueryUser->isRegistered()) {
diff --git a/templates/edit_image.tpl b/templates/edit_image.tpl
index 04f4a70..d5d3ec4 100644
--- a/templates/edit_image.tpl
+++ b/templates/edit_image.tpl
@@ -1,7 +1,5 @@
{strip}
-{include file="bitpackage:fisheye/crop_image_js.tpl"}
-
<div class="floaticon">
<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php">{biticon ipackage="liberty" iname="upload" iexplain="upload new image"}</a>
</div>
diff --git a/templates/gallery_nav.tpl b/templates/gallery_nav.tpl
index 1328950..e6c3cd5 100644
--- a/templates/gallery_nav.tpl
+++ b/templates/gallery_nav.tpl
@@ -17,6 +17,10 @@
{else}
&laquo;&nbsp;{tr}previous{/tr}
{/if}
+ {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )}
+ <br />
+ <img src="{$gGallery->mInfo.previous_image_avatar}" />
+ {/if}
</a>
{else}&nbsp;{/if}
</span>
@@ -29,6 +33,10 @@
{else}
{tr}next{/tr}&nbsp;&raquo;
{/if}
+ {if $gBitSystem->isFeatureActive( 'gallery_bar_use_thumbnails' )}
+ <br />
+ <img src="{$gGallery->mInfo.next_image_avatar}" />
+ {/if}
</a>
{else}&nbsp;{/if}
</span>
diff --git a/templates/image_order.tpl b/templates/image_order.tpl
index 0a33c30..ad57cc5 100644
--- a/templates/image_order.tpl
+++ b/templates/image_order.tpl
@@ -13,7 +13,7 @@
<table class="data">
<caption>{tr}Image Order{/tr}</caption>
<tr>
- <td style="width:1px;"></td>
+ <th style="width:1px;"></th>
<th scope="col" style="width:1px;">{tr}Thumbnail{/tr}</th>
<th scope="col">{tr}Title and Position{/tr}</th>
<th scope="col">{tr}Miscellaneous{/tr}</th>
@@ -54,7 +54,7 @@
<div class="row">
{formlabel label="Position" for="imagePosition-`$galleryImages[ix]->mContentId`"}
{forminput}
- <input type="text" size="3" maxlength="3" name="imagePosition[{$galleryImages[ix]->mContentId}]" id="imagePosition-{$galleryImages[ix]->mContentId}" value="{$galleryImages[ix]->mInfo.position}"/>
+ <input type="text" size="8" maxlength="15" name="imagePosition[{$galleryImages[ix]->mContentId}]" id="imagePosition-{$galleryImages[ix]->mContentId}" value="{$galleryImages[ix]->mInfo.position}"/>
{/forminput}
</div>
@@ -106,24 +106,32 @@
<option value="delete">{tr}Delete{/tr}</option>
<option value="remove">{tr}Remove{/tr} ({tr}Don't delete if in other galleries{/tr})</option>
<option value="thumbnail">{tr}Regenerate Thumbnails{/tr}</option>
- <option value="rotate:-90">&lt;&lt; {tr}Rotate Counter Clockwise{/tr}</option>
- <option value="rotate:90">&gt;&gt; {tr}Rotate Clockwise{/tr}</option>
+ <optgroup label="{tr}Rotate{/tr}">
+ <option value="rotate:90">&gt;&gt; {tr}Rotate Clockwise{/tr}</option>
+ <option value="rotate:-90">&lt;&lt; {tr}Rotate Counter Clockwise{/tr}</option>
+ </optgroup>
{if $gBitSystem->isPackageActive( 'gatekeeper' ) }
- <option value="security:">{tr}Set Security to{/tr} ~~ {tr}Publically Visible{/tr} ~~</option>
- {foreach from=$securities key=secId item=sec}
- <option value="security:{$secId}">{tr}Set Security to{/tr} "{$sec.security_description}"</option>
- {/foreach}
+ <optgroup label="{tr}Set Security to{/tr}">
+ <option value="security:">~~ {tr}Publically Visible{/tr} ~~</option>
+ {foreach from=$securities key=secId item=sec}
+ <option value="security:{$secId}">{tr}Set Security to{/tr} "{$sec.security_description}"</option>
+ {/foreach}
+ </optgroup>
{/if}
- {foreach from=$galleryList item=gal key=galleryId}
- {if $gContent->mInfo.content_id ne $gal.content_id}
- <option value="gallerycopy:{$gal.content_id}">{tr}Copy to gallery{/tr} "{$gal.title|truncate:30}"</option>
- {/if}
- {/foreach}
- {foreach from=$galleryList item=gal key=galleryId}
- {if $gContent->mInfo.content_id ne $gal.content_id}
- <option value="gallerymove:{$gal.content_id}">{tr}Move to gallery{/tr} "{$gal.title|truncate:30}"</option>
- {/if}
- {/foreach}
+ <optgroup label="{tr}Copy to Gallery{/tr}">
+ {foreach from=$galleryList item=gal key=galleryId}
+ {if $gContent->mInfo.content_id ne $gal.content_id}
+ <option value="gallerycopy:{$gal.content_id}">{$gal.title|truncate:50}</option>
+ {/if}
+ {/foreach}
+ </optgroup>
+ <optgroup label="{tr}Move to Gallery{/tr}">
+ {foreach from=$galleryList item=gal key=galleryId}
+ {if $gContent->mInfo.content_id ne $gal.content_id}
+ <option value="gallerymove:{$gal.content_id}">{$gal.title|truncate:50}</option>
+ {/if}
+ {/foreach}
+ </optgroup>
</select>
{formhelp note=""}
{/forminput}
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index bf4350f..56e173d 100644
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -26,6 +26,8 @@
</ul>
</div>
+ {minifind}
+
<ul class="clear data">
{foreach from=$galleryList key=galleryId item=gal}
<li class="item {cycle values='odd,even'} {$gal.content_type_guid}">
@@ -97,6 +99,7 @@
</ul>
<div class="clear"></div>
+ {libertypagination page=$curPage numPages=$numPages find=$find}
</div> <!-- end .body -->
</div> <!-- end .fisheye -->
{/strip}
diff --git a/templates/upload_fisheye.tpl b/templates/upload_fisheye.tpl
index 1976136..85bbc9f 100644
--- a/templates/upload_fisheye.tpl
+++ b/templates/upload_fisheye.tpl
@@ -1,15 +1,15 @@
<div class="admin fisheye">
<div class="header">
- <h1>{tr}Upload Images{/tr}</h1>
+ <h1>{tr}Upload Files{/tr}</h1>
</div>
<div class="body">
- {form enctype="multipart/form-data" legend="Upload Images"}
+ {form enctype="multipart/form-data" legend="Upload Files"}
{formfeedback note=$quotaMessage}
{formfeedback warning="The maximum file size you can upload is `$uploadMax` Megabytes"}
{formfeedback error=$errors}
- {formhelp note="Here you can upload images. You can upload single image files, or you can upload archived files (.zip's, .sit's, .tar's, etc.) Archvied uploads will automatically be decompressed, and a gallery will created for every gallery in it. If you have nested folders, the hierarchy will be maintained for you with nested galleries." force=true}
+ {formhelp note="Here you can upload files. You can upload single files, or you can upload archived files (.zip's, .sit's, .tar's, etc.) Archvied uploads will automatically be decompressed, and a gallery will created for every gallery in it. If you have nested folders, the hierarchy will be maintained for you with nested galleries." force=true}
{if $browserInfo.platform=='mac'}
{formhelp note="Mac Users: The newer .sitx format is not supported currently because the makers of the StuffIt application have not released new versions of their software for servers. Please use DropZip or similar for best results." force=true}
{/if}
@@ -21,8 +21,8 @@
<div class="row">
{formlabel label="Select File(s)"}
{forminput}
- <input type="file" name="file0" id="imageupload" />
- {formhelp note=""}
+ <input type="file" name="file0" id="fileupload" />
+ {formhelp note="To upload more than one file, please click on choose repeatedly<br />(javascript has to be enabled for this to work)."}
{/forminput}
</div>
@@ -35,13 +35,25 @@
<script type="text/javascript">//<![CDATA[
// Multi file upload
var multi_selector = new MultiSelector( document.getElementById( 'fileslist' ), 10 );
- multi_selector.addElement( document.getElementById( 'imageupload' ) );
+ multi_selector.addElement( document.getElementById( 'fileupload' ) );
//]]></script>
{/forminput}
</div>
+ {if $gBitUser->hasPermission( 'bit_p_fisheye_upload_nonimages' )}
+ <div class="row">
+ {formlabel label="Process Archive(s)" for="process_archive"}
+ {forminput}
+ <input type="checkbox" id="process_archive" name="process_archive" value="true" checked="checked" />
+ {formhelp note="If you don't want to have archived files processed and extracted, please uncheck the above box."}
+ {/forminput}
+ </div>
+ {else}
+ <input type="hidden" id="process_archive" value="true" />
+ {/if}
+
<div class="row">
- {formlabel label="Add Image(s) to these Galleries"}
+ {formlabel label="Add File(s) to these Galleries"}
{forminput}
{foreach from=$galleryList key=galId item=gal}
<input type="checkbox" name="galleryAdditions[]" value="{$galId}"
@@ -58,7 +70,7 @@
<a href="{$smarty.const.FISHEYE_PKG_URL}view.php?gallery_id={$gal.gallery_id}">{$gal.title}</a>
<br />
{foreachelse}
- <div>{tr}No Galleries Found{/tr}. {tr}A gallery named <strong>{displayname hash=$gBitUser->mInfo nolink=1}'s Gallery</strong> will be created for you and images will be added to it.{/tr}</div>
+ <div>{tr}No Galleries Found{/tr}. {tr}A gallery named <strong>{displayname hash=$gBitUser->mInfo nolink=1}'s Gallery</strong> will be created for you and files will be added to it.{/tr}</div>
{/foreach}
{/forminput}
</div>
diff --git a/templates/view_image.tpl b/templates/view_image.tpl
index c70a351..8699bdd 100644
--- a/templates/view_image.tpl
+++ b/templates/view_image.tpl
@@ -11,8 +11,8 @@
{/if}
{/if}
{if $gContent->hasUserPermission('bit_p_admin')}
- <a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}">{biticon ipackage=liberty iname="edit" iexplain="Edit Image"}</a>
- <a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}&amp;delete=1">{biticon ipackage=liberty iname="delete" iexplain="Delete Image"}</a>
+ <a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}">{biticon ipackage=liberty iname="edit" iexplain="Edit Image"}</a>
+ <a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}&amp;delete=1">{biticon ipackage=liberty iname="delete" iexplain="Delete Image"}</a>
{/if}
</div>
@@ -36,12 +36,13 @@
{/box}
<div class="pagination">
- {if $gContent->mInfo.width && $gContent->mInfo.height}
- {tr}View other sizes{/tr}<br />
- {foreach key=size from=$gContent->mInfo.image_file.thumbnail_url item=url}
+ {tr}View other sizes{/tr}<br />
+ {foreach key=size from=$gContent->mInfo.image_file.thumbnail_url item=url}
{if $url != $gContent->mInfo.display_url}<a href="{$gContent->getDisplayUrl(0,$size)|escape}">{/if}{$size}{if $url != $gContent->mInfo.display_url}</a>{/if}&nbsp;&bull;&nbsp;
- {/foreach}
- <a href="{$gContent->mInfo.image_file.source_url}">Original</a> {$gContent->mInfo.width}x{$gContent->mInfo.height}
+ {/foreach}
+ <a href="{$gContent->mInfo.image_file.source_url}">Original</a>
+ {if $gContent->mInfo.width && $gContent->mInfo.height}
+ &nbsp;{$gContent->mInfo.width}x{$gContent->mInfo.height}
{/if}
</div>
</div> <!-- end .body -->