class_image.php

@@ -186,7 +186,7 @@ class Image implements JsonSerializable {
     public static function getImagesForAlbum($albumid = 0) {
         global $globaldbh;
 
-        $query = "SELECT id FROM " . AppDB::TABLE_IMAGES . " WHERE album_id=:album_id ORDER BY filename";
+        $query = "SELECT id FROM " . AppDB::TABLE_IMAGES . " WHERE album_id=:album_id ORDER BY title";
         $sth = $globaldbh->prepare($query);
         $sth->bindValue(":album_id", (int) $albumid, PDO::PARAM_INT);
         $sth->execute();
@@ -238,7 +238,7 @@ class Image implements JsonSerializable {
     public static function getList() {
         global $globaldbh;
 
-        $query = "SELECT id FROM " . AppDB::TABLE_IMAGES . " ORDER BY album_id, filename";
+        $query = "SELECT id FROM " . AppDB::TABLE_IMAGES . " ORDER BY album_id, title";
         $sth = $globaldbh->prepare($query);
         $sth->execute();
         $thelist = array();

js/scalemodels.js

@@ -1,7 +1,6 @@
 var lightboxImages = [];
 var editAlbumID = 0;
 var editImageID = 0;
-var currentAlbum = 0;
 
 $(document).ready(function() {
     $("#edit_album").dialog({
@@ -50,7 +49,6 @@ $(document).ready(function() {
     });
     $("#btn_refresh").click(function() { refreshAlbums() });
     $("#btn_album_0").click(function() { showAlbum($(this)) });
-    $(".albuminfo_label").click(function() { editAlbum(currentAlbum); });
     getAlbumInfo();
 });
 
@@ -62,7 +60,6 @@ function refreshAlbums() {
         dataType: 'json',
         success: function(data, stat, jqo) {
             toastr.success("Album list refreshed", "Refresh");
-            getAlbumInfo();
         },
         error: function(jqp, status, error) {
             toastr.error("Error refreshing album list!\n" + error, "Server Error");
@@ -107,14 +104,14 @@ function getAlbumInfo() {
                     showImage($(this));
                 }
             });
-            currentAlbum = data.currentalbum;
             $(".griditem_title").click(function() {
                 if ( data.currentalbum == 0 ) {
-                    editAlbum($(this).attr("id").substring($(this).attr("id").lastIndexOf("_") + 1));
+                    editAlbum($(this));
                 } else {
-                    editImage($(this).attr("id").substring($(this).attr("id").lastIndexOf("_") + 1));
+                    editImage($(this));
                 }
             });
+            console.log(lightboxImages);
         },
         error: function(jqp, status, error) {
             toastr.error("Error retrieving album info!\n" + error, "Server Error");
@@ -207,10 +204,6 @@ function saveAlbumInfo() {
             if ( data.success ) {
                 $("#edit_album").dialog("close");
                 $("#title_"+data.album.id).text(data.album.title);
-                if ( currentAlbum != 0 ) {
-                    $("#albumtitle").text(data.album.title);
-                    $("#albumdescription").text(data.album.description);
-                }
             } else {
                 toastr.error("Could not get album information!", "Album Data Error");
             }
@@ -221,7 +214,8 @@ function saveAlbumInfo() {
     });
 }
 
-function editAlbum(albumid) {
+function editAlbum(clickedElement) {
+    var albumid = clickedElement.attr("id").substring(clickedElement.attr("id").lastIndexOf("_") + 1);
     $.ajax({
         type: 'GET',
         url: 'ajax/getalbum.php',
@@ -245,7 +239,8 @@ function editAlbum(albumid) {
     });
 }
 
-function editImage(imageid) {
+function editImage(clickedElement) {
+    var imageid = clickedElement.attr("id").substring(clickedElement.attr("id").lastIndexOf("_") + 1);
     $.ajax({
         type: 'GET',
         url: 'ajax/getimage.php',

scalemodels.php

@@ -14,8 +14,8 @@ if ( $currentuser->isLoggedIn() ) {
 }
 ?>
 <div class="albumdetails hidden" id="albumdetails">
-<div><span class="albuminfo_label textlink">Album Title:</span> <span class="albuminfo" id="albumtitle"></span></div>
-<div class="albuminfo_label textlink">Album Description:</div>
+<div><span class="albuminfo_label">Album Title:</span> <span class="albuminfo" id="albumtitle"></span></div>
+<div class="albuminfo_label">Album Description:</div>
 <div class="albuminfo spacebelow_small" id="albumdescription"></div>
 <div id="albumdescription"></div>
 </div>