From 25a533bd72c34e9775af71c010a39db6caf7b633 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 14:21:57 +0100 Subject: New modal dialog for item expiry --- view/php/theme_init.php | 8 +++++++- view/tpl/jot-header.tpl | 24 ++++++++++++++++++++++-- view/tpl/jot.tpl | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index f2f0af5f1..da64ce08e 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,7 +10,12 @@ head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); head_add_css('library/colorbox/colorbox.css'); + // head_add_css('library/font_awesome/css/font-awesome.min.css'); +head_add_css('view/css/conversation.css'); +head_add_css('view/css/bootstrap-red.css'); +head_add_css('view/css/widgets.css'); +head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); head_add_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); @@ -40,7 +45,8 @@ head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); head_add_js('library/colorbox/jquery.colorbox-min.js'); - +head_add_js('library/bootstrap-datetimepicker/js/moment.js'); +head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'); /** * Those who require this feature will know what to do with it. * Those who don't, won't. diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 1ceca04c6..09d035979 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -194,10 +194,17 @@ function enableOnUser(){ } function jotGetExpiry() { - reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); - if(reply && reply.length) { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#expiryModal').modal(); + $('#expiry-modal-OKButton').on('click', function() { + reply=$('#expiration-date').val(); + if(reply && reply.length) { $('#jot-expire').val(reply); + $('#expiryModal').modal('hide'); } +}) + + } function jotShare(id) { @@ -299,3 +306,16 @@ function enableOnUser(){ + + diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ef91f45be..72553f944 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -90,9 +90,42 @@ {{$jotnets}} + + + + + + -
-- cgit v1.2.3 From 242bae5acda15b12cb87379cf6173daa16807930 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 14:55:28 +0100 Subject: Merge --- view/tpl/saved_searches_aside.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index 615eca39d..c670ee3fa 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -12,3 +12,4 @@
+ -- cgit v1.2.3 From 1a72239af040551817813ce056640ebba6ab1ccb Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 14:58:27 +0100 Subject: Correction --- view/tpl/_conv_item.tpl | 118 ------------------------------------- view/tpl/_group_side.tpl | 33 ----------- view/tpl/_saved_searches_aside.tpl | 15 ----- 3 files changed, 166 deletions(-) delete mode 100755 view/tpl/_conv_item.tpl delete mode 100755 view/tpl/_group_side.tpl delete mode 100755 view/tpl/_saved_searches_aside.tpl (limited to 'view') diff --git a/view/tpl/_conv_item.tpl b/view/tpl/_conv_item.tpl deleted file mode 100755 index b6e3df7c4..000000000 --- a/view/tpl/_conv_item.tpl +++ /dev/null @@ -1,118 +0,0 @@ -{{if $item.comment_firstcollapsed}} -
- {{$item.num_comments}} {{$item.hide_text}} -
- {{/if}} diff --git a/view/tpl/_group_side.tpl b/view/tpl/_group_side.tpl deleted file mode 100755 index e350087f0..000000000 --- a/view/tpl/_group_side.tpl +++ /dev/null @@ -1,33 +0,0 @@ -
-

{{$title}}

- -
- - - {{if $ungrouped}} - - {{/if}} -
-
- - diff --git a/view/tpl/_saved_searches_aside.tpl b/view/tpl/_saved_searches_aside.tpl deleted file mode 100755 index 2ca2ef6ea..000000000 --- a/view/tpl/_saved_searches_aside.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-
-
- {{$searchbox}} - -
-
-
-- cgit v1.2.3 From 0f4b6ba3718445e17de0d56017e55ab099b6f61d Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 15:05:56 +0100 Subject: Merge correction --- view/php/theme_init.php | 3 --- view/tpl/saved_searches_aside.tpl | 1 - 2 files changed, 4 deletions(-) (limited to 'view') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 509df8fef..4aecb8ecf 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -15,10 +15,7 @@ head_add_css('library/colorbox/colorbox.css'); head_add_css('view/css/conversation.css'); head_add_css('view/css/bootstrap-red.css'); head_add_css('view/css/widgets.css'); -<<<<<<< HEAD head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); -======= ->>>>>>> upstream/master head_add_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index c670ee3fa..615eca39d 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -12,4 +12,3 @@
- -- cgit v1.2.3 From 6480e14a910252f550929d3e1d7520a966dfbb09 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 20:01:18 +0100 Subject: Use the red matrix icons --- view/tpl/jot.tpl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index abe1c0924..a0bc9c805 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -101,7 +101,8 @@
- + +
@@ -117,7 +118,13 @@ -- cgit v1.2.3