diff options
| -rw-r--r-- | js/spin.js | 16 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 54 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 10 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 86 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 |
5 files changed, 108 insertions, 60 deletions
diff --git a/js/spin.js b/js/spin.js index c66c607a7..af1c55f06 100644 --- a/js/spin.js +++ b/js/spin.js @@ -1,4 +1,4 @@ -//fgnass.github.com/spin.js#v1.3 +//fgnass.github.com/spin.js#v1.3.2 /** * Copyright (c) 2011-2013 Felix Gnass @@ -89,12 +89,12 @@ , pp , i - if(s[prop] !== undefined) return prop prop = prop.charAt(0).toUpperCase() + prop.slice(1) for(i=0; i<prefixes.length; i++) { pp = prefixes[i]+prop if(s[pp] !== undefined) return pp } + if(s[prop] !== undefined) return prop } /** @@ -130,6 +130,13 @@ return o } + /** + * Returns the line color from the given string or array. + */ + function getColor(color, idx) { + return typeof color == 'string' ? color : color[idx % color.length] + } + // Built-in defaults var defaults = { @@ -259,8 +266,7 @@ }) if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})) - - ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)'))) + ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)'))) } return el }, @@ -314,7 +320,7 @@ top: -o.width>>1, filter: filter }), - vml('fill', {color: o.color, opacity: o.opacity}), + vml('fill', {color: getColor(o.color, i), opacity: o.opacity}), vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change ) ) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index cd0842683..16ec7a34f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -351,7 +351,12 @@ footer { } #jot-perms-icon { - float: left; + display: block; + color: #fff; + padding: 8px; + text-align: center; + text-decoration: none; + text-shadow: 1px 1px #111; } #jot-title, #jot-category, #jot-pagetitle { @@ -1028,10 +1033,14 @@ footer { float: left; margin-left: 15px; } -#jot-preview-link { - float: left; - margin-left: 45px; - margin-top: 0px !important; + +#jot-preview-link .icon-eye-open { + display:block; + color: #fff; + padding-top: 8px; + text-align: center; + text-decoration: none; + text-shadow: 1px 1px #111; } #profile-nolocation-wrapper { @@ -1043,13 +1052,27 @@ footer { margin-left: 15px; } -#profile-jot-perms { +#profile-jot-perms, +#jot-preview-link { + height: 28px; + width: 28px; float: right; - background-color: $toolicon_colour; + background: linear-gradient(top, $toolicon_colour 0%, #707070); + background: -webkit-linear-gradient(top, $toolicon_colour 0%, #707070); + background: -moz-linear-gradient(top, $toolicon_colour 0%, #707070); + background: -o-linear-gradient(top, $toolicon_colour 0%, #707070); + background: -ms-linear-gradient(top, $toolicon_colour 0%, #707070); border: 1px solid #666; border-right: none; - border-radius: $radiuspx 0px 0px $radiuspx; - padding: 6px; +} + +#profile-jot-perms:hover, +#jot-preview-link:hover { + background: linear-gradient(top, #707070 0%, $toolicon_colour); + background: -webkit-linear-gradient(top, #707070 0%, $toolicon_colour); + background: -moz-linear-gradient(top, #707070 0%, $toolicon_colour); + background: -o-linear-gradient(top, #707070 0%, $toolicon_colour); + background: -ms-linear-gradient(top, #707070 0%, $toolicon_colour); } #profile-jot-perms-end { @@ -1376,6 +1399,18 @@ tr.mceLast { box-shadow: 4px 4px 3px 0 #444444; } +.jot-tools-right :last-child { + border-radius: $radiuspx 0px 0px $radiuspx; +} + +.jot-tools-right :first-child { + border-radius: 0px $radiuspx $radiuspx 0px; +} + +.jot-tools-right :only-child { + border-radius: $radiuspx; +} + #profile-jot-submit { height: 30px; width: 70px; @@ -1386,7 +1421,6 @@ tr.mceLast { background: -ms-linear-gradient(top, #0080ff 0%, #0080aa); color: #fff; font-weight: bold; - border-radius: 0px $radiuspx $radiuspx 0px; float: right; text-shadow: 1px 1px #111; cursor: pointer; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index e40a94fcc..eb50c188e 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -18,6 +18,14 @@ function cmtBbClose(comment, id) { $(document).ready(function() { +document.jotpermsunlock = 'icon-unlock'; +document.jotpermslock = 'icon-lock'; + +if($('#jot-perms-icon').hasClass('lock')) + $('#jot-perms-icon').addClass('icon-lock'); +if($('#jot-perms-icon').hasClass('unlock')) + $('#jot-perms-icon').addClass('icon-unlock'); + $('.group-edit-icon').hover( function() { $(this).addClass('icon'); $(this).removeClass('iconspacer');}, @@ -68,4 +76,4 @@ $(document).ready(function(){ } }; setInterval(function () {checkNotify();}, 10 * 1000); -});
\ No newline at end of file +}); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 666fae9cd..d260165ab 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -29,51 +29,51 @@ <div id="profile-jot-text-loading"></div> <div id="profile-jot-submit-wrapper" class="jothidden"> - <input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /> - - <div id="profile-upload-wrapper" style="display: {{$visitor}};" > - <div id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div> - </div> - <div id="profile-attach-wrapper" style="display: {{$visitor}};" > - <div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div> - </div> - - <div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > - <i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i> - </div> - <div id="profile-video-wrapper" style="display: {{$visitor}};" > - <i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i> - </div> - <div id="profile-audio-wrapper" style="display: {{$visitor}};" > - <i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i> - </div> - <div id="profile-location-wrapper" style="display: {{$visitor}};" > - <i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i> - </div> - <div id="profile-nolocation-wrapper" style="display: none;" > - <i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i> + <div class="jot-tools-left"> + <div id="profile-upload-wrapper" style="display: {{$visitor}};" > + <div id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div> + </div> + <div id="profile-attach-wrapper" style="display: {{$visitor}};" > + <div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div> + </div> + <div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > + <i id="profile-link" class="icon-link jot-icons" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></i> + </div> + <div id="profile-video-wrapper" style="display: {{$visitor}};" > + <i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i> + </div> + <div id="profile-audio-wrapper" style="display: {{$visitor}};" > + <i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i> + </div> + <div id="profile-location-wrapper" style="display: {{$visitor}};" > + <i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i> + </div> + <div id="profile-nolocation-wrapper" style="display: none;" > + <i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i> + </div> + <div id="profile-expire-wrapper" style="display: {{$feature_expire}};" > + <i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i> + </div> + <div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" > + <i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i> + </div> + <div id="profile-rotator-wrapper" style="display: {{$visitor}};" > + <div id="profile-rotator"></div> + </div> </div> - <div id="profile-expire-wrapper" style="display: {{$feature_expire}};" > - <i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i> - </div> - <div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" > - <i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i> - </div> - - - <div id="profile-rotator-wrapper" style="display: {{$visitor}};" > - <div id="profile-rotator"></div> - </div> - - {{if $showacl}} - <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" > - <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}" title="{{$permset}}" ></a>{{$bang}} + <div class="jot-tools-right"> + <input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /> + {{if $preview}} + <div onclick="preview_post();" id="jot-preview-link" class="fakelink"> + <i id="jot-preview-icon "class="icon-eye-open" title="{{$preview}}"></i> + </div> + {{/if}} + {{if $showacl}} + <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" > + <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="{{$lockstate}}" title="{{$permset}}" ></a>{{$bang}} + </div> + {{/if}} </div> - {{/if}} - - {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}} - - <div id="profile-jot-perms-end"></div> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index f27afed09..c78f15aa8 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -6,7 +6,7 @@ <ul> {{if $userinfo}} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="nav-dropdown-indicator">▼</span></a> + <li id="nav-user-linkmenu" class="nav-menu-icon">{{if $localuser}}<a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}">{{/if}}<img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">{{if $localuser}}<span class="nav-dropdown-indicator">▼</span></a>{{/if}} {{if $localuser}} <ul id="nav-user-menu" class="menu-popup"> {{foreach $nav.usermenu as $usermenu}} |