moved src/admin/index.php to src/config.php and changed navigation menu icon, the...

diff --git a/Makefile b/Makefile
index 310b57d..4144e5a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,8 @@ endif
        $(LN) sql/log_module/* $(DESTDIR)/usr/share/iserv/db/log_module\r
        \r
        # web pages\r
-       $(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/admin\r
-       $(LN) src/index.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/\r
-       $(LN) src/admin/*.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/admin/\r
+       $(MKDIR) $(DESTDIR)/usr/share/iserv/www/mod_room-reservation\r
+       $(LN) src/{config,index}.php $(DESTDIR)/usr/share/iserv/www/mod_room-reservation/\r
        \r
        # additional files\r
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/room-reservation\r

diff --git a/img/16/mod_room-reservation_config.png b/img/16/mod_room-reservation_config.png
deleted file mode 100644 (file)
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 (file)
--- 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");
 ?>\r

diff --git a/src/admin/index.php b/src/admin/index.php
deleted file mode 100644 (file)
index f4ef22e..0000000
--- a/src/admin/index.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**\r
- * @file index.php
- * Configuration page\r
- * @author Roland Hieber (roland.hieber@wilhelm-gym.net)\r
- * @date 20.05.2008\r
- * \r
- * Copyright © 2007 Roland Hieber\r
- *\r
- * Permission is hereby granted, free of charge, to any person obtaining\r
- * copy of this software and associated documentation files (the "Software"),\r
- * to deal in the Software without restriction, including without limitation\r
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,\r
- * and/or sell copies of the Software, and to permit persons to whom the\r
- * Software is furnished to do so, subject to the following conditions:\r
- * \r
- * The above copyright notice and this permission notice shall be included in\r
- * all copies or substantial portions of the Software.\r
- *\r
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
- * THE SOFTWARE.\r
- */\r
-\r
-/** @todo document */\r
-
-require_once("sec/admsecure.inc");
-require_once("mod_room-reservation/globals.inc");\r
-require_once("mod_room-reservation/mod_roomReservationConfigPage.inc");
-
-$page = new mod_roomReservationConfigPage($g_rrCfg);
-$page->show();
-?>\r

diff --git a/src/config.php b/src/config.php
new file mode 100644 (file)
index 0000000..e53b70a
--- /dev/null
+++ b/src/config.php
@@ -0,0 +1,37 @@
+<?php
+/**\r
+ * @file config.php
+ * Configuration page\r
+ * @author Roland Hieber (roland.hieber@wilhelm-gym.net)\r
+ * @date 20.05.2008\r
+ * \r
+ * Copyright © 2007 Roland Hieber\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining\r
+ * copy of this software and associated documentation files (the "Software"),\r
+ * to deal in the Software without restriction, including without limitation\r
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,\r
+ * and/or sell copies of the Software, and to permit persons to whom the\r
+ * Software is furnished to do so, subject to the following conditions:\r
+ * \r
+ * The above copyright notice and this permission notice shall be included in\r
+ * all copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
+ * THE SOFTWARE.\r
+ */\r
+\r
+/** @todo document */\r
+
+require_once("sec/admsecure.inc");
+require_once("mod_room-reservation/globals.inc");\r
+require_once("mod_room-reservation/mod_roomReservationConfigPage.inc");
+
+$page = new mod_roomReservationConfigPage($g_rrCfg);
+$page->show();
+?>\r