From 548d95d132d3f3d24ba0abcd6db2e8db7c577cab Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 26 Oct 2010 18:16:34 +0200 Subject: remove jqueryui, we will be using FCBKcomplete --- data/templates/editbookmark.tpl.php | 64 ++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 25 deletions(-) (limited to 'data/templates/editbookmark.tpl.php') diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index dd6b100..44e3ac3 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -16,22 +16,11 @@ switch ($row['bStatus']) { break; } -$this->includeTemplate("dojo.inc"); - function jsEscTitle($title) { return addcslashes($title, "'"); } ?> - - - - -
+ + + + + + + + + includeTemplate('dynamictags.inc'); + //FIXME$this->includeTemplate('dynamictags.inc'); // Bookmarklets and import links if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) { @@ -139,17 +147,18 @@ if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) {+:
+ -- cgit v1.2.3-54-g00ecf From 8146646a0e1c7535e62aeebab049f7b1740c86ae Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 17 Mar 2011 08:46:15 +0100 Subject: prepare jquery autocomplete (does not work yet) --- data/templates/editbookmark.tpl.php | 19 +++++++------------ www/ajax/getcontacttags.php | 22 ++++++++++++---------- www/bookmarks.php | 11 +++++++---- 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'data/templates/editbookmark.tpl.php') diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 44e3ac3..504249b 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -26,12 +26,12 @@ function jsEscTitle($title)' . var_export($_POST, true) . '
';die(); if ((GET_ACTION == "add") && !$userservice->isLoggedOn()) { @@ -143,7 +146,7 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { $description = trim(POST_DESCRIPTION); $privateNote = trim(POST_PRIVATENOTE); $status = intval(POST_STATUS); - $categories = trim(POST_TAGS); + $categories = trim(implode(',', $_POST['tags'])); $saved = true; if ($bookmarkservice->addBookmark($address, $title, $description, $privateNote, $status, $categories)) { if (POST_POPUP != '') { @@ -184,10 +187,10 @@ if ($templatename == 'editbookmark.tpl') { 'bAddress' => stripslashes(POST_ADDRESS), 'bDescription' => stripslashes(POST_DESCRIPTION), 'bPrivateNote' => stripslashes(POST_PRIVATENOTE), - 'tags' => (POST_TAGS ? explode(',', stripslashes(POST_TAGS)) : array()), + 'tags' => ($_POST['tags'] ? $_POST['tags'] : array()), 'bStatus' => 0, ); - $tplVars['tags'] = POST_TAGS; + $tplVars['tags'] = $_POST['tags']; } else { if(GET_COPYOF != '') { //copy from bookmarks page $tplVars['row'] = $bookmarkservice->getBookmark(intval(GET_COPYOF), true); -- cgit v1.2.3-54-g00ecf From abc2ca6f79d14ed92fdd251284708212eba425dd Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 22 Mar 2011 18:06:43 +0100 Subject: add jquery-ui with autocomplete --- data/templates/editbookmark.tpl.php | 10 +- www/js/jquery-ui-1.8.5/jquery-ui-1.8.5.custom.js | 1362 ++++++++++++++++++++ www/js/jquery-ui-1.8.5/jquery.ui.autocomplete.js | 555 ++++++++ .../jquery-ui-1.8.5/jquery.ui.autocomplete.min.js | 31 + www/js/jquery-ui-1.8.5/jquery.ui.core.js | 307 +++++ www/js/jquery-ui-1.8.5/jquery.ui.core.min.js | 17 + www/js/jquery-ui-1.8.5/jquery.ui.position.js | 251 ++++ www/js/jquery-ui-1.8.5/jquery.ui.position.min.js | 16 + www/js/jquery-ui-1.8.5/jquery.ui.widget.js | 249 ++++ www/js/jquery-ui-1.8.5/jquery.ui.widget.min.js | 15 + .../base/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../base/images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 178 bytes .../base/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 120 bytes .../base/images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../base/images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 111 bytes .../base/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 110 bytes .../base/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 101 bytes .../themes/base/images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../themes/base/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../themes/base/images/ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../themes/base/images/ui-icons_888888_256x240.png | Bin 0 -> 4369 bytes .../themes/base/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes .../jquery-ui-1.8.5/themes/base/jquery.ui.all.css | 11 + .../themes/base/jquery.ui.autocomplete.css | 53 + .../jquery-ui-1.8.5/themes/base/jquery.ui.base.css | 2 + .../jquery-ui-1.8.5/themes/base/jquery.ui.core.css | 41 + .../themes/base/jquery.ui.theme.css | 252 ++++ 28 files changed, 3167 insertions(+), 5 deletions(-) create mode 100644 www/js/jquery-ui-1.8.5/jquery-ui-1.8.5.custom.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.autocomplete.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.autocomplete.min.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.core.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.core.min.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.position.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.position.min.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.widget.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.widget.min.js create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_222222_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_2e83ff_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_454545_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_888888_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_cd0a0a_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.all.css create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.autocomplete.css create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.base.css create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.core.css create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.theme.css (limited to 'data/templates/editbookmark.tpl.php') diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 504249b..bbdd544 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -117,12 +117,12 @@ function jsEscTitle($title) - + - - - - + + + + diff --git a/www/bookmarks.php b/www/bookmarks.php index 0753c16..3b1d50a 100644 --- a/www/bookmarks.php +++ b/www/bookmarks.php @@ -146,7 +146,7 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { $description = trim(POST_DESCRIPTION); $privateNote = trim(POST_PRIVATENOTE); $status = intval(POST_STATUS); - $categories = trim(implode(',', $_POST['tags'])); + $categories = explode(',', $_POST['tags']); $saved = true; if ($bookmarkservice->addBookmark($address, $title, $description, $privateNote, $status, $categories)) { if (POST_POPUP != '') { -- cgit v1.2.3-54-g00ecf From f67250a720c96031309f7c9ed129bb30e4972242 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 22 Mar 2011 21:08:17 +0100 Subject: do not error out when the bookmark cannot be saved --- data/templates/editbookmark.tpl.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'data/templates/editbookmark.tpl.php') diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 0bfdb29..727ee1a 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -20,6 +20,10 @@ function jsEscTitle($title) { return addcslashes($title, "'"); } + +if (is_array($row['tags'])) { + $row['tags'] = implode(', ', $row['tags']); +} ?>