From 2bf94356d8618f04c22b16be4c15571e12daf3de Mon Sep 17 00:00:00 2001
From: "Mark (ilosuna)" <mail at mark-hoschek dot de>
Date: Sun, 14 Dec 2014 16:45:31 +0100
Subject: [PATCH] Insert image order fix

---
 cms/data/content.sqlite                       | Bin 393216 -> 393216 bytes
 cms/includes/insert_thumbnail.inc.php         |   2 +-
 cms/lang/ukrainian.admin.lang.php             |   4 +--
 .../subtemplates/modal_insert_thumbnail.tpl   |  24 +++++++++++++++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite
index e4e78ebcc2d99f7ccf65c5504d827975e272dccd..13fa9d7957e80f8a657fc68f981124f4bf1428da 100644
GIT binary patch
delta 306
zcmZo@kZ5R-m>|u#exi&s<NC&g)&$0_2~5lX*Gp83Rrggh*JhSas^O~9sI{zJSNpd%
zpzcy#WbMp4!8)}n)4JZOuzJPXr&aIkHdS`j6jYzB4=aCA`Mp}J_GlGbg>$V+EpN?_
znuj%WsuapURom1ARX?lVQN5tLx^i80Nd1utrmAUGr>bsN?yf7Yd|7#?s=l(YGP2UN
zQncdd)HY^*=56(CTW2skmoqNkey5!IG!uVy0Ruk+0!&|C#cVnKeHC*fcWomBH&kMJ
zK{d1O_8ryC8yTnD)-y|p*S%qoKxl%p>fTImsAXO;-Jy<o4NLtD2C0dTV$<K$F$YW!
gs|T8AXryOoqGxEPXJXR+sGb>!S++l_XO(LJ0Gx+%!vFvP

delta 327
zcmZo@kZ5R-m>|u#Zla7c<GRL#)&$0_2~5lX*GpB4RX0~N*V~p)s^O~9sI{z}R{OLz
zpzcy#WNl;Z&pN&;)4JZOuzL2|vsLfwHdS`j6jYzB4=aCA`Mp}Jc5M|~g>$V+EpN?_
znuj%WsuapURom1ARX?lVQ9ZS~pmJSxNd1utrmAUGyQ@xB?yf7Yd|7#?s=l(YGP2UN
zQncdd)HY^*=H+#7w$5O7E@ynO{Z2XaX{PDhs+cYLtJgB{Ga$h9_f^b|)2pkQZMkbR
z8MvVm+jmqmZ)6m&(_oN5D21}>G^Wp}WnRHjKZ8MHqNB)khdSmp)7k2o10-jNu`ufk
zCg<norskCt#}}j)#TO)|ry3ee53Ofz;x@3*Gc?pQGSD+NY=2bG48$zkAJwzUH2?rs
Cp?Hn}

diff --git a/cms/includes/insert_thumbnail.inc.php b/cms/includes/insert_thumbnail.inc.php
index b3b953f..88be391 100644
--- a/cms/includes/insert_thumbnail.inc.php
+++ b/cms/includes/insert_thumbnail.inc.php
@@ -22,7 +22,7 @@ if(isset($_SESSION[$settings['session_prefix'].'user_id']))
 
    if(isset($_POST['gallery']))
     {
-     $dbr = Database::$content->prepare("SELECT id, title,	photo_thumbnail FROM ".Database::$db_settings['photo_table']." WHERE gallery=:gallery ORDER BY sequence ASC");
+     $dbr = Database::$content->prepare("SELECT id, title, photo_thumbnail FROM ".Database::$db_settings['photo_table']." WHERE gallery=:gallery ORDER BY gallery ASC, sequence ASC");
      $dbr->bindParam(':gallery', $_POST['gallery'], PDO::PARAM_STR);
      $dbr->execute();
      $i=0;
diff --git a/cms/lang/ukrainian.admin.lang.php b/cms/lang/ukrainian.admin.lang.php
index d34a220..3c0f385 100644
--- a/cms/lang/ukrainian.admin.lang.php
+++ b/cms/lang/ukrainian.admin.lang.php
@@ -37,7 +37,7 @@ $lang['admin_menu_page_overview'] =      'Сторінки';
 $lang['admin_menu_create_page'] =        'Додати сторінку';
 $lang['admin_menu_edit_menus'] =         'Меню';
 $lang['admin_menu_edit_galleries'] =     'Галереї';
-$lang['admin_menu_edit_notes'] =         'Замітки';
+$lang['admin_menu_edit_notes'] =         'Нотатки';
 $lang['admin_menu_edit_gcb'] =           'Блоки';
 $lang['admin_menu_edit_comments'] =      'Комментарі';
 $lang['admin_menu_filemanager'] =        'Файли';
@@ -350,7 +350,7 @@ $lang['user_name'] =                     'Ім\'я';
 $lang['user_type'] =                     'Роль';
 $lang['type_0'] =                        'Редактор';
 $lang['type_1'] =                        'Адмінистратор';
-$lang['last_login'] =                    'Останній вход';
+$lang['last_login'] =                    'Останній вхід';
 $lang['no_users'] =                      'Немає користувачів.';
 $lang['create_user_account'] =           'Створити нового користувача';
 $lang['user_name_m'] =                   'Ім\'я користувача:';
diff --git a/cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl b/cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl
index bc98db4..13bfcf7 100644
--- a/cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl
+++ b/cms/templates/admin/subtemplates/modal_insert_thumbnail.tpl
@@ -7,11 +7,29 @@
         <div class="form-group">
             <select id="thumbnailselect" class="form-control" size="20">
                 <?php foreach ($thumbnails as $thumbnail): ?>
-                    <option value="<?php echo $thumbnail['id']; ?>"><?php echo $thumbnail['title']; ?>
-                        (<?php echo $thumbnail['gallery']; ?>)
+                    
+                    <?php
+                    $previous_gallery = isset($current_gallery) ? $current_gallery : false;
+                    $current_gallery = $thumbnail['gallery'];
+                    ?>
+                    
+                    <?php if($current_gallery!=$previous_gallery): ?>
+                    <?php if($previous_gallery): ?>
+                    	</optgroup>
+                    <?php endif; ?>
+                    	<optgroup label="<?php echo $current_gallery; ?>">
+                    <?php endif; ?>
+                    
+                    <option value="<?php echo $thumbnail['id']; ?>">
+                    	<?php echo $thumbnail['title']; ?>
                     </option>
+                    
+                    <?php if($current_gallery!=$previous_gallery): ?>
+                    
+                    <?php endif; ?>                    
+                    
                 <?php endforeach; ?>
-            </select>
+                </optgroup>            </select>
         </div>
         <div class="form-group">
             <label for="image_class"><?php echo $lang['insert_image_class']; ?></label>