From eccb0ac4d2b25e34b32e3d565c783c4d87bcb822 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 18:30:30 +0200 Subject: port to spin.js --- view/tpl/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 1470d0725..550cda911 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -144,7 +144,7 @@ - + -- cgit v1.2.3 From b590d294bc234caae81a1ba3cf04e340d8625dfc Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 18:36:46 +0200 Subject: slight change for #nav-search-spinner --- view/theme/redbasic/css/style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5fb4e8b36..041664d50 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2408,9 +2408,7 @@ aside input[type='text'] { #nav-search-spinner { float: right; - margin-top: 8px; - margin-left: 5px; - margin-right: 5px; + margin: 12px 12px 0px 0px; } #nav-search-text:hover { -- cgit v1.2.3 From be92ca980f673027a137a4c345dca83b24b0daee Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 19:56:05 +0200 Subject: port to spin.js --- view/tpl/conv_frame.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 81d655be2..4f9b35177 100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -15,5 +15,4 @@
{{/if}} - - +
-- cgit v1.2.3 From 8eb18632d1100510cd32bd855e4e4dca189236cf Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 20:14:42 +0200 Subject: slight change to #page-spinner --- view/theme/redbasic/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 041664d50..129e7edae 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3675,7 +3675,8 @@ ul.menu-popup { } #page-spinner { - margin-left: 50%; + color: #777; + margin: 24px; } .tabs-end { -- cgit v1.2.3 From caa02c28f22fac78629bf631806ca0f9513666da Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 20:18:30 +0200 Subject: Update conv_frame.tpl --- view/tpl/conv_frame.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 4f9b35177..359b8e7fc 100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -16,3 +16,4 @@ {{/if}}
+ -- cgit v1.2.3 From 33d1736228374d13f70d1cfd158a4e99f00a5cbc Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 21:40:53 +0200 Subject: port like button to spin.js --- view/tpl/jot-header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ae0ccc8e8..03a23ecc8 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -200,12 +200,12 @@ function enableOnUser(){ function jotShare(id) { if ($('#jot-popup').length != 0) $('#jot-popup').show(); - $('#like-rotator-' + id).show(); + $('#like-rotator-' + id).spin('tiny); $.get('{{$baseurl}}/share/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#like-rotator-' + id).hide(); + $('#like-rotator-' + id).spin(false); $(window).scrollTop(0); }); -- cgit v1.2.3 From 34364fd1ed47dc0f52554916f9e17ac7610d8ca7 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 21:42:38 +0200 Subject: port like button to spin.js --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index e4178eb39..d678bfbee 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -90,7 +90,7 @@ {{if $item.filer}} {{/if}} - +
{{if $item.drop.dropping}}{{/if}} -- cgit v1.2.3 From ec0d460dc586c1ae3fa6f6cc492e3c7f691da000 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 21:43:50 +0200 Subject: port like button to spin.js --- view/tpl/like_noshare.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl index b8258d64a..261b61815 100755 --- a/view/tpl/like_noshare.tpl +++ b/view/tpl/like_noshare.tpl @@ -6,5 +6,5 @@ -- cgit v1.2.3 From a0f2d20e20822da57da8bf40d28a29e648306f32 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 21:47:06 +0200 Subject: port like button to spin.js --- view/theme/redbasic/css/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 129e7edae..7bc7e02ed 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1064,7 +1064,9 @@ footer { } .like-rotator { - margin-left: 5px; + float: left; + margin: 8px; + color: #777; } .wall-item-delete-wrapper { -- cgit v1.2.3 From e1a1fc9a5e00f12584096de4b1a199d22622da85 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 23:25:31 +0200 Subject: port jot to spin.js --- view/tpl/jot.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 4f52cff20..f3410c5f4 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -23,9 +23,9 @@
{{/if}}
-
+
-- cgit v1.2.3 From 7e00a1662d0c56a97d64881da5ef4ba0c88e65e3 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 23:31:34 +0200 Subject: port jot to spin.js --- view/tpl/jot-header.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 03a23ecc8..dfc707fb5 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -12,9 +12,9 @@ var plaintext = '{{$editselect}}'; function initEditor(cb){ if (editor==false){ - $("#profile-jot-text-loading").show(); + $("#profile-jot-text-loading").spin('small'); if(plaintext == 'none') { - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; @@ -83,7 +83,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false); $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); -- cgit v1.2.3 From 3ca93a2b9e953890c280778293b7af26cfbf7073 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 23:33:21 +0200 Subject: port jot to spin.js --- view/tpl/main_slider.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index fe4495f77..8169de6ec 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -26,7 +26,7 @@ return; if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax)) return; - setTimeout(function() { $("#profile-jot-text-loading").show(); }, 1000 ); + setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 ); slideTimer = setTimeout(networkTimerRefresh,2000); } -- cgit v1.2.3 From 6abaa37fe37ee52a01e686ab3b722bcf8c2693f3 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 23:35:38 +0200 Subject: port jot to spin.js --- view/theme/redbasic/css/style.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7bc7e02ed..d56f69f8d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1688,6 +1688,12 @@ tr.mceLast { color: #000000; } +#profile-jot-text-loading { + float: left; + margin: 14px 0px 0px 12px; + color: #777; +} + .wall-item-photo, .photo, .contact-block-img, .my-comment-photo { border-radius: 5px; -moz-border-radius: 5px; -- cgit v1.2.3