From: Laury GvR Date: Wed, 13 Aug 2014 18:49:21 +0000 (-0400) Subject: Main nav dropdown styles X-Git-Tag: V1.0^2~95 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=000e5560e2c97846426dad81222adfb63e7561b1;p=web%2FKeweenaw.git Main nav dropdown styles Also minor edit to importHtImages which was still referencing PetoskeyArea. A js for videos added. --- diff --git a/Toolkit/CKImages/Database/importHtImages.php b/Toolkit/CKImages/Database/importHtImages.php index 5aaa481..3aa5b5b 100755 --- a/Toolkit/CKImages/Database/importHtImages.php +++ b/Toolkit/CKImages/Database/importHtImages.php @@ -3,7 +3,7 @@ require_once '../../../setup.phtml'; // set this to the real sites url // is0.gaslightmedia.com will only fetch the images if // it has access and it cannot do http auth -define('HT_IMAGES_URL', 'http://www.petoskeyarea.com/images/ht_images/'); +define('HT_IMAGES_URL', 'http://www.keweenaw.info/images/ht_images/'); $dbh = Toolkit_Database::getInstance(); $import = new Toolkit_CKImages_Database_Import($dbh); $import->runImport(); diff --git a/Toolkit/Page.php b/Toolkit/Page.php index 9eb526a..bf05339 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -173,12 +173,12 @@ class Toolkit_Page private function _video() { - //$GLOBALS['styleSheets'][] - // = GLM_APP_BASE_URL . 'gallery/colorbox/colorbox.css'; - //$GLOBALS['bottomScripts'][] - // = GLM_APP_BASE_URL . 'libjs/plugins/colorbox/1.3.15/jquery.colorbox-min.js'; - //$GLOBALS['bottomScripts'][] - // = BASE_URL . 'Toolkit/Videos/libjs/thickbox.js'; + $GLOBALS['styleSheets'][] + = GLM_APP_BASE_URL . 'gallery/colorbox/colorbox.css'; + $GLOBALS['bottomScripts'][] + = GLM_APP_BASE_URL . 'libjs/plugins/colorbox/1.3.15/jquery.colorbox-min.js'; + $GLOBALS['bottomScripts'][] + = BASE_URL . 'Toolkit/Videos/libjs/thickbox.js'; $GLOBALS['bottomScripts'][] = BASE_URL . 'Toolkit/Videos/libjs/videos.js'; $dbh = Toolkit_Database::getInstance(); diff --git a/Toolkit/Videos/libjs/thickbox.js b/Toolkit/Videos/libjs/thickbox.js new file mode 100644 index 0000000..3a52e5f --- /dev/null +++ b/Toolkit/Videos/libjs/thickbox.js @@ -0,0 +1,14 @@ +var ThickBox = { + init: function() { + $('a.colorbox').colorbox({iframe: true, innerWidth:425, innerHeight:344}); + $('select.posSelect').each(function () { + $(this).change(function(){ + var id = $(this).attr('rel'); + var newpos = $(this).attr('value'); + window.location.href = '../video-move/' + id + '/' + newpos + '/'; + }); + }); + } +}; + +$(document).ready(ThickBox.init); \ No newline at end of file diff --git a/styles.css b/styles.css index 7599213..ead61bc 100644 --- a/styles.css +++ b/styles.css @@ -18,6 +18,14 @@ time, mark, audio, video { font-size: 100%; /* vertical-align: baseline;*/ } + +nav.top-bar .top-bar-section > ul > li.shopping ul.dropdown, +nav.top-bar .top-bar-section > ul > li.calendar ul.dropdown, + .restaurants .dropdown { + right: -1% !important; + left: auto !important; +} + .glmCheckBox { width: auto; margin-bottom: 1rem; diff --git a/templates/template.html b/templates/template.html index ac81654..ea165e0 100644 --- a/templates/template.html +++ b/templates/template.html @@ -144,14 +144,14 @@

Get the Keweenaw Adventure Guide and Others!

-

View our Videos

+

View our Videos