diff --git a/application/views/layout/footer.php b/application/views/layout/footer.php index 92a8d60f..4972f3ed 100644 --- a/application/views/layout/footer.php +++ b/application/views/layout/footer.php @@ -1,6 +1,7 @@ + - \ No newline at end of file + diff --git a/application/views/layout/header.php b/application/views/layout/header.php index d2e0fc56..6f19d877 100644 --- a/application/views/layout/header.php +++ b/application/views/layout/header.php @@ -17,6 +17,13 @@ + + + @@ -117,3 +124,4 @@
+
diff --git a/css/main.css b/css/main.css index 881c7ffe..97e03115 100644 --- a/css/main.css +++ b/css/main.css @@ -1,6 +1,13 @@ +html, body {height: 100%;} + +#wrap {min-height: 100%;} + +#main {overflow:hidden; padding-bottom: 3em; /* must be same height as the footer */ } + #container { padding-top: 50px; width: 940px; margin: 0 auto; } -#footer { width: 940px; margin: 0 auto; text-align: right; } +#footer { width: 940px; margin: -3em auto; text-align: right; position: relative; clear:both; height: 3em; +/* margin-top must be the negative value of footer height */ } table .titles { font-weight: bold; color: #439BF6; } table .title { font-weight: bold; color: #439BF6; } @@ -38,4 +45,4 @@ input[type="text"] { input#country { width: 180px; -} \ No newline at end of file +} diff --git a/install/README.md b/install/README.md deleted file mode 100644 index c129fd17..00000000 --- a/install/README.md +++ /dev/null @@ -1,35 +0,0 @@ -CodeIgniter Installer -====================== - -General Information --------------------- - -CI Installer is a starting point for giving your downloadable CodeIgniter -application an installer. - -If you're making a CI app that is designed to be downloaded and self-hosted, -CI Installer provides an easy way for the user to get the database structure and -configuration in place. - -NOTE: This is to be used as a starting point. You will have to customize it to -make it work for your application, and you might have to dig into the code -a little bit. It's pretty simple, so if you have a basic understanding of PHP -you shouldn't have trouble. - -General Instructions ---------------------- - -1. Download CI Installer, rename the folder to 'install' and put it in the root -directory of your CI install (as a sibling to the /system folder). -2. Make an SQL dump of your desired database structure and intial data and paste -it into assets/install.sql -3. Open up index.php and change "Your App" in the to your app's name. -4. If your CI application folder is a sibling of your system folder instead of a -child (this is common), do a find/replace to replace 'system/application' with -'application' in each of this project's files. -- In index.php, around line 37 change 'welcome' to the URL of the page -(in CodeIgniter) that you want the user to be redirected to after installing. -- Visit http://example.com/path/to/yourapp/install and see how it goes. - -If you have problems or have recommendations, please file an issue at -http://github.com/mikecrittenden/ci-installer/ or else it won't get fixed! diff --git a/install/UNLICENSE.md b/install/UNLICENSE.md deleted file mode 100644 index e5d2f275..00000000 --- a/install/UNLICENSE.md +++ /dev/null @@ -1,27 +0,0 @@ -THIS CODE IS RELEASED UNDER [THE UNLICENSE](http://unlucense.org) ----------------------------------------------------------------------- - -**This is free and unencumbered software released into the public domain.** - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -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 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. - -For more information, please refer to [unlicense.org/](http://unlicense.org). diff --git a/install/assets/install.sql b/install/assets/install.sql index de7ec395..0acf76b2 100755 --- a/install/assets/install.sql +++ b/install/assets/install.sql @@ -39,6 +39,22 @@ CREATE TABLE IF NOT EXISTS `api` ( -- +-- -------------------------------------------------------- + +-- +-- Table structure for table `cat` +-- + +CREATE TABLE IF NOT EXISTS `cat` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `radio` varchar(250) NOT NULL, + `frequency` int(11) NOT NULL, + `mode` varchar(10) NOT NULL, + `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + + -- -------------------------------------------------------- -- @@ -3563,10 +3579,10 @@ CREATE TABLE IF NOT EXISTS `notes` ( -- -------------------------------------------------------- -- --- Table structure for table `table_hrd_contacts_v01` +-- Table structure for table `TABLE_HRD_CONTACTS_V01` -- -CREATE TABLE IF NOT EXISTS `table_hrd_contacts_v01` ( +CREATE TABLE IF NOT EXISTS `TABLE_HRD_CONTACTS_V01` ( `COL_PRIMARY_KEY` int(11) NOT NULL AUTO_INCREMENT, `COL_ADDRESS` varchar(255) DEFAULT NULL, `COL_AGE` int(11) DEFAULT NULL, @@ -3815,8 +3831,6 @@ CREATE TABLE IF NOT EXISTS `users` ( `user_locator` varchar(255) NOT NULL, `user_firstname` varchar(255) NOT NULL, `user_lastname` varchar(255) NOT NULL, - `user_lotw_name` varchar(32) NULL COMMENT 'LoTW Username', - `user_lotw_password` varchar(64) NULL COMMENT 'LoTW Password', PRIMARY KEY (`user_id`), UNIQUE KEY `user_name` (`user_name`), UNIQUE KEY `user_email` (`user_email`) diff --git a/install/config/config.php b/install/config/config.php index 0754a2db..379f3db6 100644 --- a/install/config/config.php +++ b/install/config/config.php @@ -25,7 +25,7 @@ $config['directory'] = "%directory%"; | 'display_freq' Show or Hide frequnecy info */ -$config['table_name'] = "table_hrd_contacts_v01"; +$config['table_name'] = "TABLE_HRD_CONTACTS_V01"; $config['locator'] = "%baselocator%"; $config['display_freq'] = false; diff --git a/install/index.php b/install/index.php index 0c73cd61..de8eac13 100644 --- a/install/index.php +++ b/install/index.php @@ -1,7 +1,7 @@ <?php -$db_config_path = '../application/config/database.php'; +$db_config_path = '../application/config/'; // Only load the classes in case the user submitted the form if($_POST) { @@ -92,7 +92,7 @@ if($_POST) { <body> <h1>Install Cloudlog</h1> - <?php if(is_writable($db_config_path)):?> + <?php if(is_writable($db_config_path)):?> <?php if(isset($message)) {echo '<p class="error">' . $message . '</p>';}?> @@ -100,8 +100,8 @@ if($_POST) { <fieldset> <legend>Configuration Settings</legend> - <label for="directory">Directory</label><input type="text" id="directory" value="cloudlog" class="input_text" name="directory" /> - <label for="websiteurl">Website URL</label><input type="text" id="websiteurl" value="http://localhost/cloudlog" class="input_text" name="websiteurl" /> + <label for="directory">Directory</label><input type="text" id="directory" value="<?php echo str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="directory" /> + <label for="websiteurl">Website URL</label><input type="text" id="websiteurl" value="http://<?php echo $_SERVER['HTTP_HOST'].str_replace("/install/", "", $_SERVER['REQUEST_URI']); ?>" class="input_text" name="websiteurl" /> <label for="locator">Default Gridsquare</label><input type="text" id="locator" value="IO91JS" class="input_text" name="locator" /> </fieldset> @@ -126,9 +126,9 @@ if($_POST) { <p>When you login create a new admin account and delete the m0abc user account.</p> - <?php else: ?> - <p class="error">Please make the /application/config/database.php file writable. <strong>Example</strong>:<br /><br /><code>chmod 777 /application/config/database.php</code></p> - <?php endif; ?> + <?php else: ?> + <p class="error">Please make the /application/config/database.php file writable. <strong>Example</strong>:<br /><br /><code>chmod 777 /application/config/database.php</code></p> + <?php endif; ?> </body> </html>