diff options
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | admin/themes/default/template/user_list.tpl | 58 | ||||
| -rw-r--r-- | admin/themes/default/theme.css | 15 | ||||
| -rw-r--r-- | include/functions_mail.inc.php | 12 | ||||
| -rw-r--r-- | language/en_UK/admin.lang.php | 3 | ||||
| -rw-r--r-- | language/fr_FR/admin.lang.php | 3 | ||||
| -rw-r--r-- | themes/default/template/slideshow.tpl | 2 | ||||
| -rw-r--r-- | tools/triggers_list.php | 8 | ||||
| -rw-r--r-- | tools/ws.htm | 8 |
9 files changed, 74 insertions, 43 deletions
@@ -3,7 +3,7 @@ Piwigo is photo gallery software for the web, built by an active community of users and developers. -Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and opensource. +Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and open source.  @@ -27,7 +27,7 @@ Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free an ### NetInstall * Download the [NetInstall script](http://piwigo.org/download/dlcounter.php?code=netinstall) - * Transfert the script to your web space with any FTP client + * Transfer the script to your web space with any FTP client * Open the script in you web browser (for example http://example.com/piwigo-netinstall.php) and follow the steps [More information](http://piwigo.org/basics/installation_netinstall) @@ -35,7 +35,7 @@ Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free an ### Manual * Download the [latest stable version](http://piwigo.org/download/dlcounter.php?code=latest) and unzip it - * Transfert everything to your webs pace with any FTP client + * Transfer everything to your web space with any FTP client * Open your website (for example http://example.com/piwigo) and follow the steps [More information](http://piwigo.org/basics/installation_manual) @@ -44,7 +44,7 @@ If you do not have your own server, consider the [piwigo.com](http://piwigo.com/ ## Contributing -Piwigo is widely driven by it's community; if you want to improve the code, fork this repo and submit your changes to the `master` branch. +Piwigo is widely driven by its community; if you want to improve the code, fork this repo and submit your changes to the `master` branch. ## License diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl index 39e3318b9..6744f6f69 100644 --- a/admin/themes/default/template/user_list.tpl +++ b/admin/themes/default/template/user_list.tpl @@ -1,3 +1,4 @@ +{include file='include/colorbox.inc.tpl'} {combine_script id='common' load='footer' path='admin/themes/default/js/common.js'} {combine_script id='jquery.dataTables' load='footer' path='themes/default/js/plugins/jquery.dataTables.js'} @@ -274,7 +275,7 @@ jQuery(document).ready(function() { jQuery("script.userDetails").html() ); - jQuery("#user"+userId).append(template(user)); + jQuery("#user"+userId).html(template(user)); /* groups select */ jQuery('[data-selectize=groups]').selectize({ @@ -339,10 +340,19 @@ jQuery(document).ready(function() { console.log('technical error loading user details'); } }); - - return '<div id="user'+userId+'" class="userProperties"><img class="loading" src="themes/default/images/ajax-loader-small.gif"></div>'; + + jQuery(".user_form_popin") + .attr("id", "user"+userId) + .html('<div class="popinWait"><span><img class="loading" src="themes/default/images/ajax-loader-small.gif"> {/literal}{'Loading...'|translate|escape:'javascript'}{literal}</span></div>') + ; } +jQuery(document).on('click', '.close-user-details', function(e) { + jQuery('.user_form_popin').colorbox.close(); + e.preventDefault(); +}); + + /* change password */ jQuery(document).on('click', '.changePasswordOpen', function() { var userId = jQuery(this).parentsUntil('form').parent().find('input[name=user_id]').val(); @@ -474,7 +484,7 @@ jQuery(document).ready(function() { jQuery('#user'+userId+' .userDelete .loading').show(); }, success:function(data) { - oTable.fnDraw(); + jQuery('.user_form_popin').colorbox.close(); jQuery('#showAddUser .infos').html('✔ User '+username+' deleted').show(); }, error:function(XMLHttpRequest, textStatus, errorThrows) { @@ -537,28 +547,17 @@ jQuery(document).ready(function() { */ jQuery(document).on('click', '#userList tbody td .openUserDetails', function() { var nTr = this.parentNode.parentNode; - if (jQuery(this).hasClass('icon-cancel-circled')) { - /* This row is already open - close it */ - jQuery(this) - .removeClass('icon-cancel-circled') - .addClass('icon-pencil') - .attr('title', "{/literal}{'Open user details'|translate|escape:'javascript'}{literal}") - .html("{/literal}{'edit'|translate|escape:'javascript'}{literal}") - ; - - oTable.fnClose( nTr ); - } - else { - /* Open this row */ - jQuery(this) - .removeClass('icon-pencil') - .addClass('icon-cancel-circled') - .attr('title', "{/literal}{'Close user details'|translate|escape:'javascript'}{literal}") - .html("{/literal}{'close'|translate|escape:'javascript'}{literal}") - ; - - oTable.fnOpen( nTr, fnFormatDetails(oTable, nTr), 'details' ); - } + + jQuery.colorbox({ + inline:true, + title:"{/literal}{'Edit user'|translate}{literal}", + href:".user_form_popin", + onClosed: function() { + oTable.fnDraw(); + } + }); + + fnFormatDetails(oTable, nTr); }); @@ -1153,7 +1152,12 @@ span.infos, span.errors {background-image:none; padding:2px 5px; margin:0;border <span class="infos propertiesUpdateDone" style="display:none">✔ <%- user.updateString %></span> - <input type="submit" value="{'Update user'|translate|escape:html}" style="display:none;" data-user_id="<%- user.id %>"> + <input type="submit" value="{'Update user'|translate|escape:html}" data-user_id="<%- user.id %>"> <img class="submitWait" src="themes/default/images/ajax-loader-small.gif" style="display:none"> + <a href="#close" class="icon-cancel-circled close-user-details" title="{'Close user details'|translate}">{'close'|translate}</a> </form> </script> + +<div style="display:none"> + <div class="user_form_popin userProperties"></div> +</div>
\ No newline at end of file diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 509aff377..0aa0dba1a 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -1228,6 +1228,21 @@ a.group_perm { .userProperty {width:340px;float:left;margin-bottom:15px;} .userActions {float:right;text-align:right;} +.user_form_popin { + width:750px; + height:430px; + padding:20px; +} + +.userProperties form { + text-align:left; +} + +.popinWait { + padding-top:200px; +} + + .preview-box.icon-zoom-in { display:block; position:relative; diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php index 01a65091b..67be16c15 100644 --- a/include/functions_mail.inc.php +++ b/include/functions_mail.inc.php @@ -555,7 +555,13 @@ SELECT } } - $return &= pwg_mail($u['email'], $args, $user_tpl); + $user_args = $args; + if ($authkey !== false) + { + $user_args['auth_key'] = $authkey['auth_key']; + } + + $return &= pwg_mail($u['email'], $user_args, $user_tpl); } switch_lang_back(); @@ -712,6 +718,10 @@ function pwg_mail($to, $args=array(), $tpl=array()) { // key compose of indexes witch allow to cache mail data $cache_key = $content_type.'-'.$lang_info['code']; + if (!empty($args['auth_key'])) + { + $cache_key.= '-'.$args['auth_key']; + } if (!isset($conf_mail[$cache_key])) { diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 0784fd46c..91237962c 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -984,6 +984,7 @@ $lang['width & height'] = 'width & height'; $lang['Upload in progress'] = 'Upload in progress'; $lang['Orphans'] = 'Orphans'; $lang['Delete %d orphan photos'] = 'Delete %d orphan photos'; +$lang['Edit user'] = 'Edit user'; $lang['Recipients'] = 'Recipients'; $lang['No recipient selected'] = 'No recipient selected'; -$lang['No user is permitted to see this private album'] = 'No user is permitted to see this private album';
\ No newline at end of file +$lang['No user is permitted to see this private album'] = 'No user is permitted to see this private album'; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 09e75eecd..688d07da8 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -985,6 +985,7 @@ $lang['No and unlock sub-albums'] = 'Non, et déverrouiller les sous-albums'; $lang['Upload in progress'] = 'Transfert en cours...'; $lang['Orphans'] = 'Orphelines'; $lang['Delete %d orphan photos'] = 'Supprimer les %d photos orphelines'; +$lang['Edit user'] = 'Éditer l\'utilisateur'; $lang['Recipients'] = 'Destinataires'; $lang['No recipient selected'] = 'Choisissez un destinataire'; -$lang['No user is permitted to see this private album'] = 'Aucun utilisateur n\'est autorisé à voir cet album privé';
\ No newline at end of file +$lang['No user is permitted to see this private album'] = 'Aucun utilisateur n\'est autorisé à voir cet album privé'; diff --git a/themes/default/template/slideshow.tpl b/themes/default/template/slideshow.tpl index 8a2304b8a..03f3655c3 100644 --- a/themes/default/template/slideshow.tpl +++ b/themes/default/template/slideshow.tpl @@ -21,4 +21,4 @@ {/if} </div> </div> -<div> +</div> diff --git a/tools/triggers_list.php b/tools/triggers_list.php index fda170950..faf33b34c 100644 --- a/tools/triggers_list.php +++ b/tools/triggers_list.php @@ -912,8 +912,8 @@ array( <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Piwigo Core Triggers</title> - <link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css"> - <link rel="stylesheet" type="text/css" href="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/css/jquery.dataTables_themeroller.css"> + <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.9.2/themes/base/jquery-ui.css"> + <link rel="stylesheet" type="text/css" href="//ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/css/jquery.dataTables_themeroller.css"> <style type="text/css"> /* BEGIN CSS RESET @@ -1024,8 +1024,8 @@ array( </div> <!-- the_footer --> -<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script> -<script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.min.js"></script> +<script type="text/javascript" src="//code.jquery.com/jquery-1.9.1.min.js"></script> +<script type="text/javascript" src="//ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.min.js"></script> <script type="text/javascript"> var oTable = $('#list').dataTable({ diff --git a/tools/ws.htm b/tools/ws.htm index 22af3d8e7..f502dd8de 100644 --- a/tools/ws.htm +++ b/tools/ws.htm @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>Piwigo web API (web-services) explorer</title> - <link rel="stylesheet" href="http://cdn.jsdelivr.net/tiptip/1.3/tipTip.css"> + <link rel="stylesheet" href="//cdn.jsdelivr.net/tiptip/1.3/tipTip.css"> <style> /* BEGIN CSS RESET @@ -245,8 +245,8 @@ Copyright © 2002-2013 <a href="http://piwigo.org">Piwigo Team</a> </div> <!-- the_footer --> -<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script> -<script src="https://cdn.jsdelivr.net/tiptip/1.3/jquery.tipTip.minified.js"></script> +<script src="//code.jquery.com/jquery-1.9.1.min.js"></script> +<script src="//cdn.jsdelivr.net/tiptip/1.3/jquery.tipTip.minified.js"></script> <script> // global vars @@ -571,4 +571,4 @@ function invokeMethod(methodName, newWindow) { </script> </body> -</html>
\ No newline at end of file +</html> |