adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 2584: redesign on add photos screens

Browse Source 
[Administration > Photos > Add] tabs become: {Web Form, Applications, FTP + Synchronization}

admin screen for pLoader is replaced by a more generic screen for applications

thanks to multisize, FTP+sync method becomes simpler


git-svn-id: http://piwigo.org/svn/trunk@13451 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2012-03-01 16:18:31 +00:00
parent c0bdb8a765
commit d53c5e454a
11 changed files with 168 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/photos_add.php
+3 -3
View File
@@ -53,11 +53,11 @@ $upload_form_config = get_upload_form_config();
$tabs = array(
array(
'code' => 'direct',
'label' => l10n('Upload Photos'),
'label' => l10n('Web Form'),
),
array(
'code' => 'ploader',
'label' => l10n('Piwigo Uploader'),
'code' => 'applications',
'label' => l10n('Applications'),
),
);
admin/photos_add_ploader.php → admin/photos_add_applications.php
View File
admin/themes/default/template/photos_add_applications.tpl
+105
View File
@@ -0,0 +1,105 @@
{include file='include/colorbox.inc.tpl'}
{footer_script}{literal}
jQuery().ready(function(){
jQuery(".illustration a").colorbox({rel:'group1'});
});
{/literal}{/footer_script}
{html_head}{literal}
<style type="text/css">
.illustration {float:left; margin-right:10px;}
fieldset p {text-align:left;margin-top:0}
</style>
{/literal}{/html_head}
<div class="titrePage">
<h2>{'Upload Photos'|@translate} {$TABSHEET_TITLE}</h2>
</div>
<fieldset>
<legend>pLoader</legend>
<div class="illustration"><a href="http://piwigo.org/ext/upload/extension-270/screenshot.jpg" title="pLoader"><img src="http://piwigo.org/ext/upload/extension-270/thumbnail.jpg"></a></div>
<p>{'pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'|@translate}</p>
<p>Available versions for
<a href="{$URL_DOWNLOAD_WINDOWS}">Windows</a>,
<a href="{$URL_DOWNLOAD_MAC}">Mac</a>,
<a href="{$URL_DOWNLOAD_LINUX}">Linux</a>
</p>
</fieldset>
<fieldset>
<legend>Piwigo Mobile</legend>
<div class="illustration"><a href="http://piwigo.com/blog/wp-content/uploads/2011/10/piwigo-ios-iphone-ipad.jpg" title="Piwigo Mobile for iOS and Android"><img src="http://piwigo.com/blog/wp-content/uploads/2011/10/piwigo-ios-iphone-ipad.jpg" style="width:150px"></a></div>
<p>{'<em>Piwigo Mobile</em> application empowers you to connect to your Piwigo gallery from your iPhone, iPad or Android, create some albums and upload several photos at once.'|@translate}</p>
<p>
Available on <a target="_blank" href="http://itunes.apple.com/us/app/piwigo/id472225196">Apple AppStore</a>
and <a target="_blank" href="https://market.android.com/details?id=org.piwigo">Android market</a>
</p>
</fieldset>
<fieldset>
<legend>Lightroom</legend>
<div class="illustration"><a href="http://alloyphoto.com/images/piwigo/dialog.png" title="Piwigo Publish plugin for Lightroom"><img src="http://alloyphoto.com/images/piwigo/dialog.png" style="width:150px"></a></div>
<p>Adobe Photoshop Lightroom is a photography software designed to manage large quantities of digital images and doing post production work. The Piwigo publish Plug-in allows you to export photos from Lightroom directly to your Piwigo photo gallery.</p>
<p>
Details and download on <a target="_blank" href="http://alloyphoto.com/plugins/piwigo/">alloyphoto.com</a>
</p>
</fieldset>
<fieldset>
<legend>Shotwell</legend>
<div class="illustration"><a href="http://piwigo.files.wordpress.com/2010/11/shotwell_002.png" title="Piwigo publish plugin for Shotwell"><img src="http://piwigo.files.wordpress.com/2010/11/shotwell_002.png?w=150"></a></div>
<p><a href="http://yorba.org/shotwell/" target="_blank">Shotwell</a> is a digital photo organizer that runs on Linux. It is the default photo manager in Ubuntu and Fedora.</p>
<p>On your Linux, simply install Shotwell with your package manager and the activate Piwigo publishing option.</p>
</fieldset>
<fieldset>
<legend>digiKam</legend>
<div class="illustration"><a href="http://fr.piwigo.org/forum/showimage.php?pid=133064&filename=digikam2piwigo-01.png" title="Piwigo publish plugin for digiKam"><img src="http://fr.piwigo.org/forum/showimage.php?pid=133064&filename=digikam2piwigo-01.png" style="width:150px"></a></div>
<p><a href="http://digikam.org/" target="_blank">digiKam</a> is an advanced digital photo management application for Linux, Windows, and Mac-OSX.</p>
<p>To export your photos from digiKam to Piwigo, simply install digiKam and the Kipi-plugins.</p>
</fieldset>
<fieldset>
<legend>iPhoto</legend>
<div class="illustration"><a href="http://piwigo.org/forum/showimage.php?pid=126856&filename=iphoto-to-piwigo.jpg" title="Piwigo export plugin for iPhoto"><img src="http://piwigo.org/forum/showimage.php?pid=126856&filename=iphoto-to-piwigo.jpg" style="width:150px"></a></div>
<p>iPhoto is the default photo manager on MacOSX. The Piwigo export plugin let you create new albums and export your photos directly from iPhoto to your Piwigo photo gallery.</p>
<p>
<a target="_blank" href="http://piwigo.org/ext/extension_view.php?eid=592">Details and download</a>
</p>
</fieldset>
<fieldset>
<legend>Aperture</legend>
<div class="illustration"><a href="http://piwigo.org/ext/upload/extension-598/screenshot.jpg" title="Piwigo export plugin for Aperture"><img src="http://piwigo.org/ext/upload/extension-598/thumbnail.jpg" style="width:150px"></a></div>
<p>Aperture is a powerful tool to refine images and manage massive libraries on your Mac. It's pro performance with iPhoto simplicity. The Piwigo export plugin allows you to create albums and export photos.</p>
<p>
<a target="_blank" href="http://piwigo.org/ext/extension_view.php?eid=598">Details and download</a>
</p>
</fieldset>
<fieldset>
<legend>ReGalAndroid</legend>
<div class="illustration"><a href="http://piwigo.org/screenshots/regalandroid.png" title="ReGalAndroid"><img src="http://piwigo.org/screenshots/regalandroid.png" style="width:150px"></a></div>
<p>ReGalAndroid (RemoteGallery client for Android) is an open source (GPL v3) Piwigo client for the Android platform. Features include gallery browsing, album creation and photo upload.</p>
<p>
Details and download on <a target="_blank" href="http://market.android.com/details?id=net.dahanne.android.regalandroid">Android Market</a>
</p>
</fieldset>
admin/themes/default/template/photos_add_direct.tpl
+1 -1
View File
@@ -218,7 +218,7 @@ var sizeLimit = Math.round({$upload_max_filesize} / 1024); /* in KBytes */
{/footer_script}
<div class="titrePage">
<h2>{'Upload Photos'|@translate}</h2>
<h2>{'Upload Photos'|@translate} {$TABSHEET_TITLE}</h2>
</div>
<div id="photosAddContent">
admin/themes/default/template/photos_add_ftp.tpl
+3 -3
View File
@@ -1,9 +1,9 @@
<div class="titrePage">
<h2>{'FTP + Synchronization'|@translate}</h2>
<h2>{'Upload Photos'|@translate} {$TABSHEET_TITLE}</h2>
</div>
<a href="{$U_CAT_UPDATE}">{'Administration'|@translate} &raquo; {'Tools'|@translate} &raquo; {'Synchronize'|@translate}</a>
<div id="ftpPage">
<p><a href="{$U_CAT_UPDATE}">{'Administration'|@translate} &raquo; {'Tools'|@translate} &raquo; {'Synchronize'|@translate}</a></p>
{$FTP_HELP_CONTENT}
</div>
admin/themes/default/template/photos_add_ploader.tpl
-88
View File
@@ -1,88 +0,0 @@
{footer_script}{literal}
jQuery().ready(function(){
jQuery("#pLoaderPage img").fadeTo("fast", 0.6);
jQuery("#pLoaderPage img").hover(
function(){
jQuery(this).fadeTo("fast", 1.0); // Opacity on hover
},
function(){
jQuery(this).fadeTo("fast", 0.6); // Opacity on mouseout
}
);
});
{/literal}{/footer_script}
{html_head}{literal}
<style type="text/css">
#pLoaderPage {
width:600px;
margin:0 auto;
font-size:1.1em;
}
#pLoaderPage P {
text-align:left;
}
#pLoaderPage .downloads {
margin:10px auto 0 auto;
}
#pLoaderPage .downloads A {
display:block;
width:150px;
text-align:center;
font-size:16px;
font-weight:bold;
}
#pLoaderPage .downloads A:hover {
border:none;
}
#pLoaderPage LI {
margin:20px;
}
</style>
{/literal}{/html_head}
<div class="titrePage">
<h2>{'Piwigo Uploader'|@translate}</h2>
</div>
<div id="pLoaderPage">
<p>{'pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'|@translate}</p>
<ol>
<li>
{'Download,'|@translate}
<table class="downloads">
<tr>
<td>
<a href="{$URL_DOWNLOAD_WINDOWS}">
<img src="http://piwigo.org/screenshots/windows.png" alt="windows">
<br>Windows
</a>
<td>
<td>
<a href="{$URL_DOWNLOAD_MAC}">
<img src="http://piwigo.org/screenshots/mac.png" alt="mac">
<br>Mac
</a>
<td>
<td>
<a href="{$URL_DOWNLOAD_LINUX}">
<img src="http://piwigo.org/screenshots/linux.png" alt="linux">
<br>Linux
</a>
<td>
</tr>
</table>
</li>
<li>{'Install on your computer,'|@translate}</li>
<li>{'Start pLoader and add your photos.'|@translate}</li>
</ol>
</div>
admin/themes/default/theme.css
+4 -1
View File
@@ -1078,4 +1078,7 @@ FORM#categoryOrdering .categoryLi:hover p.albumActions {visibility:visible;}
.showCreateAlbum {text-align:left; margin:0 1em 1em 1em;line-height:22px;}
#autoOrder p, #createAlbum p {text-align:left; margin:0 0 1em 0;}
#autoOrder p.actionButtons, #createAlbum p.actionButtons {margin-bottom:0;}
#autoOrder p.actionButtons, #createAlbum p.actionButtons {margin-bottom:0;}
#ftpPage p {text-align:left;margin:1em;}
#ftpPage fieldset p {margin:0;}