Some minor fixes in admin

nikrou · Aug 10, 2017 · 05fa5cf · 05fa5cf
1 parent 67d710d
commit 05fa5cf
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,4 @@
 
 ;;
 /themes/default/build
+/themes/default/*.log
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@ sudo: false
 
 language: php
 php:
-  - "5.6"
   - "7.0"
+  - "7.1"
 
 services:
   - postgresql

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Phyxo 1.7.0 - 2017-??-??
 ========================
 * Remove template extensions. Use inheritance instead.
-* New core theme  "Treflez".
+* New core theme "Treflez".
 * PHP minimum version is now 7.0.0. PHP 5 reaches end of life and is now only security fixes.
 
 Phyxo 1.6.3 - 2017-01-05

diff --git a/admin/theme/template/configuration_main.tpl b/admin/theme/template/configuration_main.tpl
@@ -187,13 +187,13 @@ jQuery("input[name='mail_theme']").change(function() {
         <label>{'Mail theme'|translate}</label>
 
         <div class="themeBoxes font-checkbox">
-        {foreach from=$main.mail_theme_options item=name key=theme}
+        {foreach $main.mail_theme_options as $theme}
           <div class="themeBox {if $main.mail_theme==$theme}themeDefault{/if}">
             <label>
-              <div class="themeName">
+		<div class="themeName">
                 <span class="icon-check"></span>
                 <input type="radio" name="mail_theme" value="{$theme}" {if $main.mail_theme==$theme}checked{/if}>
-                {$name}
+                {$theme}
               </div>
               <div class="themeShot">
                 <img src="./theme/template/mail/screenshot-{$theme}.png" width="150"/>

diff --git a/admin/theme/template/mail/screenshot-treflez.png b/admin/theme/template/mail/screenshot-treflez.png
diff --git a/admin/theme/theme.css b/admin/theme/theme.css
@@ -52,15 +52,6 @@ UL.thumbnails li.rank-of-image {
   margin: 4px;
 	overflow: hidden;
 }
-.clipwrapper {
-  position:relative;
-  width: 96px;
-  height: 96px;
-  margin: 3px;
-}
-.clip {
-  position:absolute;
-}
 
 UL.thumbnails SPAN.wrap1 {
   margin: 5px;

diff --git a/language/en_GB/admin.lang.php b/language/en_GB/admin.lang.php
@@ -1,7 +1,7 @@
 <?php
 // +-----------------------------------------------------------------------+
 // | Phyxo - Another web based photo gallery                               |
-// | Copyright(C) 2014-2015 Nicolas Roudaire         http://www.phyxo.net/ |
+// | Copyright(C) 2014-2017 Nicolas Roudaire        https://www.phyxo.net/ |
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
@@ -162,4 +162,5 @@
 $lang['Empty caddie'] = 'Empty basket';
 
 $lang['Development'] = "Developement";
-$lang['Javascript tests'] = "Javascript tests";
+$lang['Javascript tests'] = "Javascript tests";
+$lang['Preview'] = "Preview";
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
@@ -1,7 +1,7 @@
 <?php
 // +-----------------------------------------------------------------------+
 // | Phyxo - Another web based photo gallery                               |
-// | Copyright(C) 2014-2015 Nicolas Roudaire         http://www.phyxo.net/ |
+// | Copyright(C) 2014-2017 Nicolas Roudaire        https://www.phyxo.net/ |
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2008-2014 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
@@ -1001,4 +1001,5 @@
 $lang['Javascript tests'] = "Tests javascript";
 
 $lang['Variation'] = "Variation";
-$lang['Consensus deviation'] = "Consensus deviation";
+$lang['Consensus deviation'] = "Consensus deviation";
+$lang['Preview'] = "Prévisualiser";