From 22e46a9b45810bae480aea72b16680d715a57ff4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 10:20:14 +0200 Subject: make linkedtags sidebar tree menu work with jquery/jstree now --- data/templates/sidebar.block.linked.php | 131 +++++++++++--------------------- 1 file changed, 45 insertions(+), 86 deletions(-) (limited to 'data/templates/sidebar.block.linked.php') diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index 9e91f93..db0d087 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -1,4 +1,11 @@ getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - -$explodedTags = array(); -if (strlen($currenttag)>0) { - $explodedTags = explode('+', $currenttag); -} else { - if($summarizeLinkedTags == true) { - $orphewTags = $tag2tagservice->getOrphewTags('>', $userid, 4, "nb"); - } else { - $orphewTags = $tag2tagservice->getOrphewTags('>', $userid); - } - - foreach($orphewTags as $orphewTag) { - $explodedTags[] = $orphewTag['tag']; - } -} - +$editingMode = $logged_on_userid !== false; ?> - +

+ \ No newline at end of file -- cgit v1.2.3-54-g00ecf From f359fd685f164855a34c85d164e0d38da12a2434 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 12:09:39 +0200 Subject: make the page valid and keep chromium happy --- data/templates/sidebar.block.linked.php | 6 +++--- data/templates/top.inc.php | 3 ++- src/SemanticScuttle/header.php | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'data/templates/sidebar.block.linked.php') diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index db0d087..54e9260 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -32,7 +32,7 @@ if ($editingMode) { ?> - +]]> \ No newline at end of file diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index 8be978f..c3cbc5d 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -1,7 +1,8 @@ + - + <?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' ยป ' . $pagetitle : '')); ?> diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index d1a5c29..3caeb35 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -120,7 +120,10 @@ $tplVars['userservice'] = $userservice; if (!defined('UNIT_TEST_MODE')) { //API files define that, so we need a way to support both of them if (!isset($httpContentType)) { - $httpContentType = 'text/html'; + //$httpContentType = 'text/html'; + //using that mime type makes all javascript nice in Chromium + // it also serves as test base if the pages really validate + $httpContentType = 'application/xhtml+xml'; } if ($httpContentType !== false) { header('Content-Type: ' . $httpContentType . '; charset=utf-8'); -- cgit v1.2.3-54-g00ecf From 6bf4e76495b03ccec29fb4d9262ac871dd10a221 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 13:03:55 +0200 Subject: make add/del tag nav links work again --- data/templates/sidebar.block.linked.php | 3 ++- www/ajax/getlinkedtags.php | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data/templates/sidebar.block.linked.php') diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index 54e9260..ac864dc 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -30,10 +30,11 @@ if ($editingMode) { echo '

'; } ?> + \ No newline at end of file -- cgit v1.2.3-54-g00ecf From c2875e45ab9c51bdc193b0b9016c2c6d043a0e09 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 14 Oct 2010 08:23:40 +0200 Subject: makde linked block look nice in non-strict mode in opera and chrome --- data/templates/sidebar.block.linked.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/templates/sidebar.block.linked.php') diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index b9a8135..9aa3cc0 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -30,8 +30,8 @@ if ($editingMode) { echo '

'; } ?> -