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 1/4] =?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 2/4] 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 3/4] =?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(){
From 826292296f15675e972eacd5cec7faa947460bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Bakkeli?=
Date: Sun, 31 Jul 2011 20:21:35 +0200
Subject: [PATCH 4/4] =?UTF-8?q?la=20til=20tagger=20for=20opplistingen=20av?=
=?UTF-8?q?=20sider=20p=C3=A5=20fronten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front-page.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/front-page.php b/front-page.php
index 0ddc671..6b2bc8d 100755
--- a/front-page.php
+++ b/front-page.php
@@ -63,7 +63,7 @@ foreach($items as $item)
{
$id = strtolower(preg_replace('#[^\w]+#', '', $item->title));
- echo "";
+ echo "
";
if($pre) echo $pre;