From fbcfbd8c4724f6138bdb00395065ac413502b297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Bakkeli?= Date: Sun, 31 Jul 2011 19:03:34 +0200 Subject: [PATCH 1/5] La til label for felt --- functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.php b/functions.php index 593c863..9eae19b 100755 --- a/functions.php +++ b/functions.php @@ -223,7 +223,7 @@ $menus = wp_get_nav_menus( );

From ea916587ecd8ccae71645fecae2ba0f08ed54c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Bakkeli?= Date: Sun, 31 Jul 2011 19:04:09 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Fikset=20s=C3=A5=20lightbox=20vises=20n?= =?UTF-8?q?=C3=A5r=20man=20trykker=20p=C3=A5=20posten,=20ikke=20bare=20len?= =?UTF-8?q?ka?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front-page.php | 3 +++ header.php | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/front-page.php b/front-page.php index a11e353..d618f58 100755 --- a/front-page.php +++ b/front-page.php @@ -61,8 +61,11 @@ foreach($items as $item) if($query) { $id = strtolower(preg_replace('#[^\w]+#', '', $item->title)); + echo "

"; + if($pre) echo $pre; + query_posts($query); get_template_part( 'loop', $loop); diff --git a/header.php b/header.php index 3a8f4d3..e4cf8fa 100755 --- a/header.php +++ b/header.php @@ -109,20 +109,27 @@ $j(function() var modal_not_match = Array(/wp-admin/); -$j(".content .post [href],#header [href]").live('click',function(e) +$j(".content .post,#header [href]").live('click',function(e) { preModal = window.location.href; + e.preventDefault(); + + if($j(this).attr('href')) + href = this.href; + else + href = $j(this).find("[href]").attr('href'); + for(var i = 0; i < modal_match.length; i++) - if(this.href.match(modal_match[i])) + if(href.match(modal_match[i])) break; if(i == modal_match.length) return; for(var i = 0; i < modal_not_match.length; i++) - if(this.href.match(modal_not_match[i])) + if(href.match(modal_not_match[i])) return; - showUrlModal(this.href); - e.preventDefault(); + showUrlModal(href); + var href = this.href.substr(); window.location = window.location.href.split("#")[0] + "#" + href; }); From f938765a884ddbb1f46686ed300195d1a9bbd0cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Bakkeli?= Date: Sun, 31 Jul 2011 19:46:35 +0200 Subject: [PATCH 3/5] =?UTF-8?q?la=20til=20link=20til=20configsiden=20av=20?= =?UTF-8?q?praktiske=20=C3=A5rsaker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front-page.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/front-page.php b/front-page.php index d618f58..0ddc671 100755 --- a/front-page.php +++ b/front-page.php @@ -27,9 +27,10 @@ if($menu_id) } else { - echo "No frontpage menu configured"; + echo 'No frontpage menu configured'; $items = array(); } + foreach($items as $item) { wp_reset_postdata(); From 0dd1a077254dcec22312a6397c78ebe319ebdb54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Bakkeli?= Date: Sun, 31 Jul 2011 19:47:25 +0200 Subject: [PATCH 4/5] Endret lenken til configsiden --- functions.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index 9eae19b..c7b4187 100755 --- a/functions.php +++ b/functions.php @@ -193,7 +193,7 @@ add_action('admin_menu', 'studio_create_menu'); function studio_create_menu() { //create new top-level menu - add_menu_page('Studio theme settings', 'Studio theme settings', 'administrator', __FILE__, 'studio_settings_page',plugins_url('/images/icon.png', __FILE__)); + add_menu_page('Studio theme settings', 'Studio theme settings', 'administrator', 'studio_lol_settings', 'studio_settings_page',plugins_url('/images/icon.png', __FILE__)); //call register settings function add_action( 'admin_init', 'register_studio_settings' ); @@ -231,4 +231,6 @@ $menus = wp_get_nav_menus( );

- + Date: Sun, 31 Jul 2011 19:48:01 +0200 Subject: [PATCH 5/5] =?UTF-8?q?fikset=20bug=20hvor=20fremsiden=20ble=20las?= =?UTF-8?q?tet=20p=C3=A5=20nytt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- header.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/header.php b/header.php index e4cf8fa..94c0222 100755 --- a/header.php +++ b/header.php @@ -68,6 +68,7 @@ function showUrlModal(href) }, onClose: function (dialog) { + setLocationWithoutScrolling(preModal); dialog.data.slideUp('fast', function () { dialog.overlay.slideUp('fast', function () { @@ -88,6 +89,9 @@ function setLocationWithoutScrolling(location) { var from = $j("body").scrollTop(); if(!from) from = $j("html").scrollTop(); + + if(location.indexOf("#") == -1) location += "#"; + window.location = location; $j("body,html").scrollTop(from); } @@ -130,7 +134,7 @@ $j(".content .post,#header [href]").live('click',function(e) showUrlModal(href); - var href = this.href.substr(); + href = href.substr(); window.location = window.location.href.split("#")[0] + "#" + href; }); $j("#simplemodal-overlay").live('click', function(){