harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "some jot tools structuring and styling"

Browse Source 
This reverts commit 1ff69605be.
This commit is contained in:
marijus 2013-12-02 12:26:07 +01:00
parent fc8c34826e
commit 0e7e5fa53d
3 changed files with 54 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
view/theme/redbasic/css/style.css
View File

@ -351,12 +351,7 @@ footer {
} }
#jot-perms-icon { #jot-perms-icon {
display: block; float: left;
color: #fff;
padding: 8px;
text-align: center;
text-decoration: none;
text-shadow: 1px 1px #111;
} }
#jot-title, #jot-category, #jot-pagetitle { #jot-title, #jot-category, #jot-pagetitle {
@ -1033,14 +1028,10 @@ footer {
float: left; float: left;
margin-left: 15px; margin-left: 15px;
} }
#jot-preview-link {
#jot-preview-link .icon-eye-open { float: left;
display:block; margin-left: 45px;
color: #fff; margin-top: 0px !important;
padding-top: 8px;
text-align: center;
text-decoration: none;
text-shadow: 1px 1px #111;
} }
#profile-nolocation-wrapper { #profile-nolocation-wrapper {
@ -1052,27 +1043,13 @@ footer {
margin-left: 15px; margin-left: 15px;
} }
#profile-jot-perms, #profile-jot-perms {
#jot-preview-link {
height: 28px;
width: 28px;
float: right; float: right;
background: linear-gradient(top, $toolicon_colour 0%, #707070); background-color: $toolicon_colour;
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: 1px solid #666;
border-right: none; 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 { #profile-jot-perms-end {
@ -1399,18 +1376,6 @@ tr.mceLast {
box-shadow: 4px 4px 3px 0 #444444; 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 { #profile-jot-submit {
height: 30px; height: 30px;
width: 70px; width: 70px;
@ -1421,6 +1386,7 @@ tr.mceLast {
background: -ms-linear-gradient(top, #0080ff 0%, #0080aa); background: -ms-linear-gradient(top, #0080ff 0%, #0080aa);
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
border-radius: 0px $radiuspx $radiuspx 0px;
float: right; float: right;
text-shadow: 1px 1px #111; text-shadow: 1px 1px #111;
cursor: pointer; cursor: pointer;

10
view/theme/redbasic/js/redbasic.js
View File

@ -18,14 +18,6 @@ function cmtBbClose(comment, id) {
$(document).ready(function() { $(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( $('.group-edit-icon').hover(
function() { function() {
$(this).addClass('icon'); $(this).removeClass('iconspacer');}, $(this).addClass('icon'); $(this).removeClass('iconspacer');},
@ -76,4 +68,4 @@ $(document).ready(function(){
} }
}; };
setInterval(function () {checkNotify();}, 10 * 1000); setInterval(function () {checkNotify();}, 10 * 1000);
}); });

86
view/tpl/jot.tpl
View File

@ -29,51 +29,51 @@
<div id="profile-jot-text-loading"></div> <div id="profile-jot-text-loading"></div>
<div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-wrapper" class="jothidden">
<div class="jot-tools-left"> <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 id="profile-upload-wrapper" style="display: {{$visitor}};" >
</div> <div id="wall-image-upload-div" ><i id="wall-image-upload" class="icon-camera jot-icons" title="{{$upload}}"></i></div>
<div id="profile-attach-wrapper" style="display: {{$visitor}};" > </div>
<div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div> <div id="profile-attach-wrapper" style="display: {{$visitor}};" >
</div> <div id="wall-file-upload-div" ><i id="wall-file-upload" class="icon-paper-clip jot-icons" title="{{$attach}}"></i></div>
<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > </div>
<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-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
<div id="profile-video-wrapper" style="display: {{$visitor}};" > <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>
<i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i> </div>
</div> <div id="profile-video-wrapper" style="display: {{$visitor}};" >
<div id="profile-audio-wrapper" style="display: {{$visitor}};" > <i id="profile-video" class="icon-facetime-video jot-icons" title="{{$video}}" onclick="jotVideoURL();return false;"></i>
<i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i> </div>
</div> <div id="profile-audio-wrapper" style="display: {{$visitor}};" >
<div id="profile-location-wrapper" style="display: {{$visitor}};" > <i id="profile-audio" class="icon-volume-up jot-icons" title="{{$audio}}" onclick="jotAudioURL();return false;"></i>
<i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i> </div>
</div> <div id="profile-location-wrapper" style="display: {{$visitor}};" >
<div id="profile-nolocation-wrapper" style="display: none;" > <i id="profile-location" class="icon-globe jot-icons" title="{{$setloc}}" onclick="jotGetLocation();return false;"></i>
<i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i> </div>
</div> <div id="profile-nolocation-wrapper" style="display: none;" >
<div id="profile-expire-wrapper" style="display: {{$feature_expire}};" > <i id="profile-nolocation" class="icon-circle-blank jot-icons" title="{{$noloc}}" onclick="jotClearLocation();return false;"></i>
<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>
<div class="jot-tools-right"> <div id="profile-expire-wrapper" style="display: {{$feature_expire}};" >
<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /> <i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
{{if $preview}} </div>
<div onclick="preview_post();" id="jot-preview-link" class="fakelink"> <div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
<i id="jot-preview-icon "class="icon-eye-open" title="{{$preview}}"></i> <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>
{{/if}}
{{if $showacl}}
<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" > <div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="{{$lockstate}}" title="{{$permset}}" ></a>{{$bang}} <div id="profile-rotator"></div>
</div> </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="icon {{$lockstate}}" title="{{$permset}}" ></a>{{$bang}}
</div> </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> <div id="profile-jot-perms-end"></div>