From 02117d6a59a710d11e1aefff9813888db35f00f3 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Oct 2011 18:04:47 +0100 Subject: [PATCH] Moved CSS & JS to seperate files --- application/views/layout/header.php | 122 +---------------------- cloudlog.sublime-workspace | 148 +++++++++++++++++++++++++++- css/global.css | 104 +++++++++++++++++++ js/global.js | 11 +++ 4 files changed, 264 insertions(+), 121 deletions(-) create mode 100644 css/global.css create mode 100644 js/global.js diff --git a/application/views/layout/header.php b/application/views/layout/header.php index 0e924ebc8..5dc6a7d53 100644 --- a/application/views/layout/header.php +++ b/application/views/layout/header.php @@ -5,32 +5,14 @@ Web Logbook + - + + - - - diff --git a/cloudlog.sublime-workspace b/cloudlog.sublime-workspace index e4d368cf2..cfb9a59a2 100644 --- a/cloudlog.sublime-workspace +++ b/cloudlog.sublime-workspace @@ -11,6 +11,38 @@ }, "buffers": [ + { + "file": "application/controllers/search.php", + "settings": + { + "buffer_size": 704, + "line_ending": "Windows" + } + }, + { + "file": "application/views/search/main.php", + "settings": + { + "buffer_size": 453, + "line_ending": "Windows" + } + }, + { + "file": "application/models/logbook_model.php", + "settings": + { + "buffer_size": 14475, + "line_ending": "Windows" + } + }, + { + "file": "application/controllers/logbook.php", + "settings": + { + "buffer_size": 6526, + "line_ending": "Windows" + } + } ], "build_system": "", "command_palette": @@ -44,14 +76,16 @@ }, "file_history": [ + "/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/qsl.php", + "/C/Users/Peter/git/HRD-Web-Frontend/application/views/qsl/main.php", + "/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/header.php", + "/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/dashboard.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/views/view_log/qso.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/logbook.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/models/logbook_model.php", - "/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/dashboard.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/views/view_log/index.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/views/dashboard/index.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/backup.php", - "/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/header.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/notes_view.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/adif_view.php", "/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/notes.php", @@ -111,8 +145,118 @@ "groups": [ { + "selected": 3, "sheets": [ + { + "buffer": 0, + "file": "application/controllers/search.php", + "settings": + { + "buffer_size": 704, + "regions": + { + }, + "selection": + [ + [ + 683, + 683 + ] + ], + "settings": + { + "syntax": "Packages/PHP/PHP.tmLanguage", + "tab_size": 4.0, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "type": "text" + }, + { + "buffer": 1, + "file": "application/views/search/main.php", + "settings": + { + "buffer_size": 453, + "regions": + { + }, + "selection": + [ + [ + 453, + 453 + ] + ], + "settings": + { + "syntax": "Packages/PHP/PHP.tmLanguage" + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "type": "text" + }, + { + "buffer": 2, + "file": "application/models/logbook_model.php", + "settings": + { + "buffer_size": 14475, + "regions": + { + }, + "selection": + [ + [ + 0, + 0 + ] + ], + "settings": + { + "syntax": "Packages/PHP/PHP.tmLanguage", + "tab_size": 4.0, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "type": "text" + }, + { + "buffer": 3, + "file": "application/controllers/logbook.php", + "settings": + { + "buffer_size": 6526, + "regions": + { + }, + "selection": + [ + [ + 3945, + 3945 + ] + ], + "settings": + { + "syntax": "Packages/PHP/PHP.tmLanguage", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 2129.0, + "zoom_level": 1.0 + }, + "type": "text" + } ] } ], diff --git a/css/global.css b/css/global.css new file mode 100644 index 000000000..ac77bb2a5 --- /dev/null +++ b/css/global.css @@ -0,0 +1,104 @@ +body { background-color: #e6e6e6; font-size: 15px; font-family: Arial, "Trebuchet MS", sans-serif; } +pre { font-family: Courier New; font-size: 11px;} +h2 { margin: 0 auto; width: 780px; font-weight: bold; font-size: 23px; margin-top: 5px; margin-bottom: 10px; } +h3 { font-weight: bold; font-size: 16px; margin: 5px; margin-left: 0px; } +.clear { clear: both; } +.small { font-size: 9px; } +.error { color: #a00; } +p { line-height: 1.7; margin: 0px 0; } + +/* Tables */ +td { padding: 1px;} +.tr1 td { background:none repeat scroll 0 0 #F0FFFF; } +table .titles { font-weight: bold; } + +/* Nav */ +#nav { background-image: url('../images/nav_bg.gif'); height: 39px; color:#ffffff; border-bottom: 1px solid #9bc9ed; } +ul#navlist { font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; } +ul#navlist li.active { float: left; background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; } +ul#navlist li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: none; text-align:center; } +#navlist .active a{ color: #ebebeb ; } +#navlist a { float: left; display: block; color: #ebebeb; text-decoration: none; padding-top: 7px; padding-left: 6px; padding-right: 5px; text-align:center; } +#navlist a:hover { } + +/* Submenu List CSS */ +ul#sublist { font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; } +ul#sublist li.active { float: left; background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; } +ul#sublist li { float: left; margin: 2px 2px 0 3px; height:20px; border-bottom: none; text-align:center; background-color: #fff; padding: 3px;} +#sublist .active a{ color: #ebebeb ; } +#sublist a { float: left; display: block; color: #000; text-decoration: none; padding-top: 0px; padding-left: 6px; padding-right: 5px; text-align:center; } +#sublist a:hover { } +#subnav { height: 30px; color:#ffffff; clear: both; } + +/* Content Area */ +.wrap_content { margin: 0 auto; width: 780px; border: 1px solid #d7d7d7; background-color: #ffffff; padding-bottom: 5px; } + +/* Message boxes */ +#message { margin: 0 auto; width: 770px; border: 1px solid #fcefa1; background-color: #fbfaf3; padding: 5px; margin-top: 5px; margin-bottom: 5px; font-weight: bold; font-size: 12px; } +#message p { line-height: 1.7; margin: 0px 0; } + +/* Links */ +a { text-decoration: none; color: #000; } +a:hover { text-decoration: underline; } + +/* Tabs */ +#tabs { margin: 5px; } +.ui-widget-content { border: none; } +.ui-widget-header { background: none; border: none; border-bottom: 1px solid #DDD; } + +/* Dashboard CSS */ +.dashboard { padding: 5px; } +.dashboard_top { margin-top: 5px; } +.dashboard_log { float: left; width: 440px; } +.dashboard_breakdown { float: right; width: 310px; } +.dashboard_bottom .chart { float: left; } +td.item { padding-bottom: 5px; } +.dashboard_breakdown .title { color: #439BF6; } + +/* Contest CSS */ +.contest_wrap { margin: 0 auto; width: 95%; } +.contest_wrap h2 { margin: 0; width: 100%; font-weight: bold; font-size: 23px; margin-top: 5px; margin-bottom: 10px; } +.contest_view { margin: 0 auto; width: 100%; border: 1px solid #d7d7d7; background-color: #ffffff; padding: 5px; } +.contest_sidebar { width: 30%; float: right; margin: 0 auto; } +.contest_qso_box { width: 695px; margin: 5px; padding: 5px; border: 1px solid #dddddd; border-radius: 10px; -moz-border-radius: 10px; -webkit-border-radius: 10px; } +.contest_qso_box table { width: 695px; } + +/* QSO Logging CSS */ +#callsign { text-transform: uppercase; } +.controls { margin: 5px; } +.title { padding-top: 5px; padding-bottom: 5px; color: #0073EA; font-weight: bold; } +#qso_input { border: 1px solid #dddddd; margin: 5px; padding: 2px; } +.input_date { width: 70px; } +.input_time { width: 54px; } +#locator { width: 55px; text-transform: uppercase; } +#country { border: none; } +#locator_info { font-size: 13px; } +#name { width: 145px; } +#comment { width: 89.5%; } +.partial td, .logbook td, .users td { padding: 5px; } +.log_title { background-image: url('../images/grey_bg.png'); background-repeat: repeat-x; color: #439bf6; } +.auth_title { background-image: url('../images/grey_bg.png'); background-repeat: repeat-x; color: #439bf6; } + +/* Note CSS */ +.note { padding: 5px; } +.auth { padding: 5px; } +#notes_add { padding: 5px; } +#search_box { padding: 5px; } +ul.notes_list {list-style-type: circle; padding-left: 20px; } + +/* User CSS */ +ul#user { float: right; font: bold 15px "Trebuchet MS", sans-serif; list-style-type: none; margin: 0; margin-left: 10px; } +ul#user li.active { background-image: none; background-color: #fff; margin: 2px 2px 0 3px; height:34px; text-align:center; } +ul#user li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: none; text-align:center; } +#user .active a{ color: #ebebeb ; } +#user a { float: left; display: block; color: #ebebeb; text-decoration: none; padding-top: 7px; padding-left: 6px; padding-right: 5px; text-align:center; } +#user a:hover { } +.user { padding: 5px; } + +/* Pager */ +.pager { margin-top: 5px; margin-bottom: 5px; font-size: 12px; } +.pager a, .pager strong { border: 1px solid #D7D7D7; padding: 5px; } +.pager a:hover { background-color: azure; } + +/* Footer */ +#footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; } \ No newline at end of file diff --git a/js/global.js b/js/global.js new file mode 100644 index 000000000..632b233a2 --- /dev/null +++ b/js/global.js @@ -0,0 +1,11 @@ + $(function(){ + // Accordion + $("#tabs").tabs(); + $( "button, input:submit", ".wrap_content" ).button(); + $( "button, input:submit", ".contest_wrap" ).button(); + $( "#admin" ).click(function() { + $( "#submenu" ).toggle( 'blinds', null, 500 ); + $( "#clear" ).toggle( 'blinds', null, 500 ); + return false; + }); + }); \ No newline at end of file