From: rohieb <devnull@localhost>
Date: Tue, 29 Jul 2008 02:19:42 +0000 (+0200)
Subject: moved src/admin/index.php to src/config.php and changed navigation menu icon, the... 
X-Git-Tag: REL_8.07.30~7
X-Git-Url: https://git.rohieb.name/iserv-mod-room-reservation.git/commitdiff_plain/ced06588972f0441b112f77212c50a6007f1eb8e

moved src/admin/index.php to src/config.php and changed navigation menu icon, the old one is no longer needed
---

diff --git a/Makefile b/Makefile
index 310b57d..4144e5a 100644
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,8 @@ endif
 	$(LN) sql/log_module/* $(DESTDIR)/usr/share/iserv/db/log_module
 	
 	# web pages
-	$(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/admin
-	$(LN) src/index.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/
-	$(LN) src/admin/*.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/admin/
+	$(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_room-reservation
+	$(LN) src/{config,index}.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/
 	
 	# additional files
 	$(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation
diff --git a/img/16/mod_room-reservation_config.png b/img/16/mod_room-reservation_config.png
deleted file mode 100644
index 5b5261b..0000000
Binary files a/img/16/mod_room-reservation_config.png and /dev/null differ
diff --git a/nav/admin/99mod_room-reservation.mod b/nav/admin/99mod_room-reservation.mod
index 909891a..45a227a 100644
--- a/nav/admin/99mod_room-reservation.mod
+++ b/nav/admin/99mod_room-reservation.mod
@@ -1,4 +1,4 @@
 <?
 TreeNode(_("Room Reservation Schedule"),
-  "mod_room-reservation/admin/", "mod_room-reservation_config");
+  "mod_room-reservation/config.php", "mod_room-reservation_index");
 ?>
diff --git a/src/admin/index.php b/src/admin/index.php
deleted file mode 100644
index f4ef22e..0000000
--- a/src/admin/index.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * @file index.php
- * Configuration page
- * @author Roland Hieber (roland.hieber@wilhelm-gym.net)
- * @date 20.05.2008
- * 
- * Copyright © 2007 Roland Hieber
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/** @todo document */
-
-require_once("sec/admsecure.inc");
-require_once("mod_room-reservation/globals.inc");
-require_once("mod_room-reservation/mod_roomReservationConfigPage.inc");
-
-$page = new mod_roomReservationConfigPage($g_rrCfg);
-$page->show();
-?>
diff --git a/src/config.php b/src/config.php
new file mode 100644
index 0000000..e53b70a
--- /dev/null
+++ b/src/config.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @file config.php
+ * Configuration page
+ * @author Roland Hieber (roland.hieber@wilhelm-gym.net)
+ * @date 20.05.2008
+ * 
+ * Copyright © 2007 Roland Hieber
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/** @todo document */
+
+require_once("sec/admsecure.inc");
+require_once("mod_room-reservation/globals.inc");
+require_once("mod_room-reservation/mod_roomReservationConfigPage.inc");
+
+$page = new mod_roomReservationConfigPage($g_rrCfg);
+$page->show();
+?>