diff mgallery.inc.php @ 106:a3b8cd4183e6

Change {album,image}_navigation setting to *_flags.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 21 Sep 2016 10:35:53 +0300
parents 7728b586a421
children 71de97240799
line wrap: on
line diff
--- a/mgallery.inc.php	Wed Sep 21 10:25:47 2016 +0300
+++ b/mgallery.inc.php	Wed Sep 21 10:35:53 2016 +0300
@@ -13,6 +13,12 @@
 
 
 //
+// Navigation control defines
+//
+define("MGF_JAVASCRIPT"   , 0x01);
+define("MGF_BREADCRUMBS"  , 0x10);
+
+//
 // Constants for different value types
 //
 define("MG_STR", 1);
@@ -25,14 +31,6 @@
 define("no", 0);
 
 
-//
-// Navigation control defines
-//
-define("GNAV_SIDE_IMG"   , 0x01);
-define("GNAV_JAVASCRIPT" , 0x02);
-define("GNAV_BREADCRUMBS", 0x04);
-
-
 function mgPathName($path)
 {
   $tmp = mgCleanPathArray(TRUE, 0, func_num_args(), func_get_args());
@@ -67,13 +65,8 @@
   "css"              => array(MG_STR, NULL),
   "album_icon"       => array(MG_STR, "album_sm.png"),
 
-  "image_navigation" => array(MG_INT, GNAV_SIDE_IMG | GNAV_JAVASCRIPT | GNAV_BREADCRUMBS),
-  "album_navigation" => array(MG_INT, GNAV_BREADCRUMBS),
-
-  "navi_ctrl_up"     => array(MG_STR, "^^"),
-  "navi_ctrl_prev"   => array(MG_STR, "<<"),
-  "navi_ctrl_next"   => array(MG_STR, ">>"),
-
+  "image_flags"      => array(MG_FLAGS, MGF_JAVASCRIPT | MGF_BREADCRUMBS),
+  "album_flags"      => array(MG_FLAGS, MGF_JAVASCRIPT | MGF_BREADCRUMBS),
   "album_row_limit"  => array(MG_INT, 5),
 
   "med_suffix"       => array(MG_STR, ".med"),