diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_new_channel.css | 4 | ||||
| -rw-r--r-- | view/en-gb/strings.php | 2 | ||||
| -rw-r--r-- | view/js/main.js | 4 | ||||
| -rw-r--r-- | view/js/mod_connedit.js | 13 | ||||
| -rw-r--r-- | view/js/mod_new_channel.js | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 24 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/new_channel.tpl | 9 |
10 files changed, 50 insertions, 16 deletions
diff --git a/view/css/mod_new_channel.css b/view/css/mod_new_channel.css index 3b9c80953..2af0fbb2d 100644 --- a/view/css/mod_new_channel.css +++ b/view/css/mod_new_channel.css @@ -1,13 +1,13 @@ h2 { margin-left: 15%; - margin-top: 15%; + margin-top: 5%; } #newchannel-form { font-size: 1.4em; margin-left: 15%; - margin-top: 5%; + margin-top: 20px; width: 50%; } diff --git a/view/en-gb/strings.php b/view/en-gb/strings.php index abf14f43a..a95915844 100644 --- a/view/en-gb/strings.php +++ b/view/en-gb/strings.php @@ -27,3 +27,5 @@ $a->strings["Do you want to authorize this application to access your posts and $a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognised, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."; $a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."; $a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool."] = "You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."; +$a->strings["l F d, Y \\@ g:i A"] = "l j F, Y \\@ G:i"; +$a->strings["D, d M Y - g:i A"] = "D, d M Y - G:i"; diff --git a/view/js/main.js b/view/js/main.js index d6b405258..2e297c9d6 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1114,7 +1114,7 @@ $(window).scroll(function () { $('#more').show(); } - if($(window).scrollTop() + $(window).height() == $(document).height()) { + if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { if((pageHasMoreContent) && (! loadingPage)) { $('#more').hide(); $('#no-more').hide(); @@ -1134,7 +1134,7 @@ $(window).scroll(function () { $('#more').show(); } - if($(window).scrollTop() + $(window).height() == $(document).height()) { + if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { if((pageHasMoreContent) && (! loadingPage) && (! justifiedGalleryActive)) { $('#more').hide(); $('#no-more').hide(); diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index 6231dbd0c..fabf24e95 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -6,11 +6,18 @@ function abook_perms_msg() { } $(document).ready(function() { - if(typeof(after_following) !== 'undefined' && after_following) - connectFullShare(); + if(typeof(after_following) !== 'undefined' && after_following) { + if(typeof(connectDefaultShare) !== 'undefined') + connectDefaultShare(); + else + connectFullShare(); + } $('#id_pending').click(function() { - connectFullShare(); + if(typeof(connectDefaultShare) !== 'undefined') + connectDefaultShare(); + else + connectFullShare(); }); $('.abook-edit-me').click(function() { diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index a3c1dd05c..882da940e 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -1,16 +1,20 @@ $(document).ready(function() { $("#newchannel-name").blur(function() { + $("#name-spinner").spin('small'); var zreg_name = $("#newchannel-name").val(); $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { $("#newchannel-nickname").val(data); zFormError("#newchannel-name-feedback",data.error); + $("#name-spinner").spin(false); }); }); $("#newchannel-nickname").blur(function() { + $("#nick-spinner").spin('small'); var zreg_nick = $("#newchannel-nickname").val(); $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { $("#newchannel-nickname").val(data); zFormError("#newchannel-nickname-feedback",data.error); + $("#nick-spinner").spin(false); }); }); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bb11ddbb9..380d6d49c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2060,11 +2060,11 @@ img.mail-list-sender-photo { .wall-item-ago { color: #777; - font-size: 0.8em; + font-size: 0.833em; } .wall-item-ago i { - font-size: 0.8em; + font-size: 0.833em; } .wall-item-content { @@ -2082,7 +2082,7 @@ img.mail-list-sender-photo { } .comment-icon { - font-size: 0.8em; + font-size: 0.833em; color: $toolicon_colour; } @@ -2256,15 +2256,27 @@ blockquote { } h1, h2 { - font-size: 1.15rem; + font-size: 1.583em; } h3, h4 { - font-size: $font_size; + font-size: 1.334em; } h5, h6 { - font-size: $body_font_size; + font-size: 0.75rem; +} + +.wall-item-content h1, .wall-item-content h2 { + font-size: 1.319em; +} + +.wall-item-title { + font-size: $font_size; +} + +.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { + font-size: 1.112em; } .dropdown-menu { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index dbe7c306d..cd91fcee7 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -64,7 +64,7 @@ if(! $a->install) { // should leave it for admins to define for themselves. if (! $schema) { if(file_exists('view/theme/redbasic/schema/default.php')) { - $schemefile = 'view/theme/redbasic/schema/' . 'default.php'; + $schemefile = 'view/theme/redbasic/schema/default.php'; require_once ($schemefile); } } diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 351cc8e14..e68314797 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -58,7 +58,7 @@ <i class="icon-eye-open comment-icon" ></i> </button> {{/if}} - <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> + <button id="comment-edit-submit-{{$id}}" class="btn btn-primary btn-xs" type="submit" name="button-submit" onclick="post_comment({{$id}}); return false;">{{$submit}}</button> </div> </div> <div class="clear"></div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c4fdba0f5..c51dc02a5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -85,7 +85,7 @@ <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="submit">{{$share}}</button> + <button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 261f965da..b28810236 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -4,8 +4,16 @@ <div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div> + <div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div> + + <label for="newchannel-role" id="label-newchannel-role" class="newchannel-label" >{{$label_role}}</label> + {{$role_select}} + <div id="newchannel-role-end" class="newchannel-field-end"></div> + + <label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label> <input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" /> + <div id="name-spinner"></div> <div id="newchannel-name-feedback" class="newchannel-feedback"></div> <div id="newchannel-name-end" class="newchannel-field-end"></div> @@ -13,6 +21,7 @@ <label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label> <input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" /> + <div id="nick-spinner"></div> <div id="newchannel-nickname-feedback" class="newchannel-feedback"></div> <div id="newchannel-nickname-end" class="newchannel-field-end"></div> |