From 3f1a78fa690e2220b46823527f3abf0a0d51cd8e Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 3 Apr 2014 17:03:32 +0200 Subject: some work on jot, remove some deprecated js and some random style fixes --- library/jquery_ac/friendica.complete.js | 4 +- view/css/conversation.css | 62 ++----------- view/css/default.css | 2 +- view/js/mod_network.js | 1 - view/theme/redbasic/css/style.css | 45 +++------- view/theme/redbasic/js/redbasic.js | 25 ------ view/tpl/jot-header.tpl | 6 +- view/tpl/jot.tpl | 151 ++++++++++++++++---------------- 8 files changed, 98 insertions(+), 198 deletions(-) diff --git a/library/jquery_ac/friendica.complete.js b/library/jquery_ac/friendica.complete.js index 190625e87..73a6e91d5 100644 --- a/library/jquery_ac/friendica.complete.js +++ b/library/jquery_ac/friendica.complete.js @@ -46,7 +46,7 @@ params: {}, fnFormatResult: fnFormatResult, delimiter: null, - zIndex: 9999 + zIndex: 999 }; this.initialize(); this.setOptions(options); @@ -78,7 +78,7 @@ if (!this.options.width) { this.options.width = this.el.width(); } this.mainContainerId = 'AutocompleteContainter_' + uid; - $('
').appendTo('body'); + $('
').appendTo('body'); this.container = $('#' + autocompleteElId); this.fixPosition(); diff --git a/view/css/conversation.css b/view/css/conversation.css index b32c5a08f..c9894f638 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -18,71 +18,20 @@ #profile-jot-text { height: 3.4em; padding: 8px; - margin-right: 0px; width: 100%; } #profile-jot-text-loading { float: left; - margin: 14px 0px 0px 12px; + padding: 30px 0px 0px 12px; } #profile-jot-submit-wrapper { margin-top: 10px; - width: 100%; -} - -#profile-jot-submit { - height: 30px; - width: 70px; - float: right; -} - -#profile-upload-wrapper, -#wall-image-upload-div, -#wall-image-upload, -#wall-file-upload-div, -#wall-file-upload, -#profile-link, -#profile-video, -#profile-audio, -#profile-location, -#profile-nolocation, -#profile-expires, -#profile-expires, -#jot-perms-icon, -#jot-preview-link, -#profile-encrypt, -.hover, .focus { - cursor: pointer; -} - -#profile-upload-wrapper, -#profile-attach-wrapper, -#profile-link-wrapper, -#profile-video-wrapper, -#profile-audio-wrapper, -#profile-location-wrapper, -#profile-nolocation-wrapper, -#profile-expire-wrapper, -#profile-encrypt-wrapper { - float: left; - margin-left: 15px; -} - -#profile-jot-perms { - float: right; - padding: 6px; } #jot-perms-icon { - float: left; -} - -#jot-preview-link { - float: left; - margin-left: 45px; - margin-top: 0px; + margin: 1px; } #profile-jot-perms-end { @@ -93,9 +42,12 @@ margin-bottom: 30px; } -#profile-rotator { +#profile-rotator-wrapper { float: left; - margin: 8px 0px 0px 20px; +} + +#profile-rotator { + margin: 16px 0px 0px 16px; } /* this is referenced in js/acl.js - not sure if it is still needed. */ diff --git a/view/css/default.css b/view/css/default.css index 267b3bd35..793148019 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -24,7 +24,7 @@ aside#region_1 { } aside input[type='text'] { - width: 174px; + width: 100%; } section { diff --git a/view/js/mod_network.js b/view/js/mod_network.js index f63a57653..e95520edb 100644 --- a/view/js/mod_network.js +++ b/view/js/mod_network.js @@ -3,7 +3,6 @@ $(document).ready(function() { a = $("#search-text").autocomplete({ serviceUrl: baseurl + '/search_ac', minChars: 2, - width: 250, id: 'search-text-ac', }); }); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0b94bff80..688dcf478 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -818,6 +818,7 @@ footer { } #search-text { + border: 1px solid #ccc; font-size: 1em; } @@ -1444,13 +1445,20 @@ div.jGrowl div.jGrowl-notification { border-top: none; } -#search-text-ac .autocomplete, +#search-text-ac .autocomplete { + margin-top: 2px; + margin-left: $radiuspx; + border: 1px solid #ccc; + border-top: none; +} + #recip-ac .autocomplete, #poke-recip-ac .autocomplete, #id-name-ac .autocomplete, #contact-search-ac .autocomplete { margin-top: 2px; margin-left: $radiuspx; + margin-right: $radiuspx; border: 1px solid #666; border-top: none; @@ -1881,34 +1889,7 @@ img.mail-list-sender-photo { #profile-jot-text-loading { color: #777; -} - -#profile-jot-submit { - background: linear-gradient(top, #0080ff 0%, #0080aa); - background: -webkit-linear-gradient(top, #0080ff 0%, #0080aa); - background: -moz-linear-gradient(top, #0080ff 0%, #0080aa); - background: -o-linear-gradient(top, #0080ff 0%, #0080aa); - background: -ms-linear-gradient(top, #0080ff 0%, #0080aa); - color: #fff; - font-weight: bold; - border-radius: 0px $radiuspx $radiuspx 0px; - text-shadow: 1px 1px #111; - cursor: pointer; -} - -#profile-jot-submit:hover { - background: linear-gradient(top, #0080aa 0%, #0080ff); - background: -webkit-linear-gradient(top, #0080aa 0%, #0080ff); - background: -moz-linear-gradient(top, #0080aa 0%, #0080ff); - background: -o-linear-gradient(top, #0080aa 0%, #0080ff); - background: -ms-linear-gradient(top, #0080aa 0%, #0080ff); -} - -#profile-jot-perms { - background-color: $toolicon_colour; - border: 1px solid #666; - border-right: none; - border-radius: $radiuspx 0px 0px $radiuspx; + display: none; } #profile-rotator { @@ -1916,14 +1897,9 @@ img.mail-list-sender-photo { } .jot-icons { - font-size: 1.2em; color: $toolicon_colour; } -.jot-icons:hover { - color: $toolicon_activecolour; -} - /* conversation */ .thread-wrapper .wall-item-comment-wrapper, @@ -2015,7 +1991,6 @@ img.mail-list-sender-photo { color: darkgreen; } - .wall-item-ago { color: #777; font-size: 0.8em; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 0aab42cd5..20902fe1a 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -40,31 +40,6 @@ if($('#tabs-collapse-1').length == 0) { $('#expand-tabs').hide(); } -$('.group-edit-icon').hover( - function() { - $(this).css('opacity','1.0');}, - function() { - $(this).css('opacity','0');} -); - -$('.sidebar-group-element').hover( - function() { - id = $(this).attr('id'); - $('#edit-' + id).css('opacity','1.0');}, - - function() { - id = $(this).attr('id'); - $('#edit-' + id).css('opacity','0');} - ); - - -$('.savedsearchdrop').hover( - function() { - $(this).css('opacity','1.0');}, - function() { - $(this).css('opacity','0');} - ); - }); diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 80421d552..6f5b84bbe 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -6,9 +6,9 @@ var plaintext = '{{$editselect}}'; function initEditor(cb){ if (editor==false){ - $("#profile-jot-text-loading").spin('small'); + $("#profile-jot-text-loading").spin('small').show(); if(plaintext == 'none') { - $("#profile-jot-text-loading").spin(false); + $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; @@ -77,7 +77,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").spin(false); + $("#profile-jot-text-loading").spin(false).hide(); $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 4cc9c0d10..eea586ceb 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,5 +1,4 @@
-
@@ -15,80 +14,86 @@ {{$mimeselect}} {{$layoutselect}} -
+
+ +
{{if $catsenabled}} -
+
+ +
{{/if}} {{if $webpage}} -
+
+ +
{{/if}}
- + +
+
+
+ + + + + + + + + +
+
+
+
+
+ {{if $showacl}} +
+ {{$bang}} +
+ {{/if}} + {{if $preview}} + + {{/if}} + +
+
+
+ {{$jotplugins}} +
+
+
+ {{$acl}} +
+ {{$jotnets}} +
+
+
+ +
+
-
- - -
-
-
-
-
-
- - -
- -
-
- -
-
- -
- -
- -
-
- -
- - -
-
-
- - {{if $showacl}} -
- {{$bang}} -
- {{/if}} - - {{if $preview}}{{/if}} - - -
- - -
- {{$jotplugins}} -
- - - -
-
- {{$acl}} -
- {{$jotnets}} -
-
- {{if $content}}{{/if}} +{{if $content}} + +{{/if}} -- cgit v1.2.3