Merge pull request #478 from fermionic/frost-improvements

Frost improvements
This commit is contained in:
fermionic 2012-09-16 17:59:01 -07:00
commit e6fc21e9fd
18 changed files with 185 additions and 23 deletions

View file

@ -19,4 +19,5 @@
window.allowGID = $allowgid; window.allowGID = $allowgid;
window.denyCID = $denycid; window.denyCID = $denycid;
window.denyGID = $denygid; window.denyGID = $denygid;
window.aclInit = "true";
</script> </script>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -0,0 +1,11 @@
if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude.toFixed(4);
var lon = position.coords.longitude.toFixed(4);
$j('#jot-coord').val(lat + ', ' + lon);
$j('#profile-nolocation-wrapper').show();
});
}

View file

@ -78,7 +78,7 @@
if( last_popup_menu ) { if( last_popup_menu ) {
if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) { if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) {
last_popup_menu.hide(); last_popup_menu.hide();
if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('section').show(); if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
last_popup_button.removeClass("selected"); last_popup_button.removeClass("selected");
last_popup_menu = null; last_popup_menu = null;
last_popup_button = null; last_popup_button = null;
@ -100,13 +100,13 @@
if (menu.css("display") == "none") { if (menu.css("display") == "none") {
$j(this).parent().addClass("selected"); $j(this).parent().addClass("selected");
menu.show(); menu.show();
if (menu.attr('id') == "nav-notifications-menu" ) $j('section').hide(); if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').hide();
last_popup_menu = menu; last_popup_menu = menu;
last_popup_button = $j(this).parent(); last_popup_button = $j(this).parent();
} else { } else {
$j(this).parent().removeClass("selected"); $j(this).parent().removeClass("selected");
menu.hide(); menu.hide();
if (menu.attr('id') == "nav-notifications-menu" ) $j('section').show(); if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
last_popup_menu = null; last_popup_menu = null;
last_popup_button = null; last_popup_button = null;
} }

File diff suppressed because one or more lines are too long

View file

@ -49,7 +49,7 @@ $j(document).ready(function() {
} }
} }
if(typeof acl=="undefined"){ if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
acl = new ACL( acl = new ACL(
baseurl+"/acl", baseurl+"/acl",
[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ] [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]

File diff suppressed because one or more lines are too long

View file

@ -12,7 +12,7 @@ html {
/* width: 320px;*/ /* width: 320px;*/
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
overflow-x:hidden; /* overflow-x:hidden;*/
} }
body { body {
@ -104,7 +104,7 @@ blockquote {
#panel { #panel {
background-color: ivory; background-color: ivory;
position: absolute; position: absolute;
z-index: 2; /* z-index: 2;*/
width: 30%; width: 30%;
padding: 25px; padding: 25px;
border: 1px solid #444; border: 1px solid #444;
@ -256,7 +256,7 @@ nav .nav-link {
-webkit-box-shadow: 3px 3px 5px #555; -webkit-box-shadow: 3px 3px 5px #555;
box-shadow: 3px 3px 5px #555; box-shadow: 3px 3px 5px #555;
z-index: 10000; z-index: 100;
} }
#network-menu-list { #network-menu-list {
@ -1206,7 +1206,7 @@ input#dfrn-url {
position: absolute; position: absolute;
left: 0px; top:110px; left: 0px; top:110px;
display: none; display: none;
z-index: 10000; /* z-index: 10000;*/
} }
.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none } .wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
.wall-item-photo-menu li a { display: block; padding: 2px; } .wall-item-photo-menu li a { display: block; padding: 2px; }
@ -1236,7 +1236,7 @@ input#dfrn-url {
position: absolute; position: absolute;
left: 75px; left: 75px;
top: 80px; top: 80px;
z-index: 100; /* z-index: 100;*/
} }
.wall-item-wrapper { .wall-item-wrapper {
margin-left:10px; margin-left:10px;
@ -1351,6 +1351,10 @@ input#dfrn-url {
} }
.wall-item-content img { .wall-item-content img {
display: block;
margin-top: 10px;
margin-right: auto;
margin-left: auto;
max-width: 290px; max-width: 290px;
border-radius: 7px; border-radius: 7px;
/* -moz-border-radius: 7px;*/ /* -moz-border-radius: 7px;*/
@ -1415,6 +1419,7 @@ input#dfrn-url {
background-repeat: repeat-x;*/ background-repeat: repeat-x;*/
padding: 5px 5px 0px; padding: 5px 5px 0px;
height: 32px; height: 32px;
} }
.wall-item-author { .wall-item-author {
/* margin-top: 10px;*/ /* margin-top: 10px;*/
@ -2025,7 +2030,7 @@ input#dfrn-url {
position: absolute; position: absolute;
left: -30px; top: 80px; left: -30px; top: 80px;
display: none; display: none;
z-index: 10000; z-index: 101;
/* -moz-box-shadow: 3px 3px 5px #555;*/ /* -moz-box-shadow: 3px 3px 5px #555;*/
-webkit-box-shadow: 3px 3px 5px #555; -webkit-box-shadow: 3px 3px 5px #555;
box-shadow: 3px 3px 5px #555; box-shadow: 3px 3px 5px #555;
@ -3595,7 +3600,13 @@ aside input[type='text'] {
background-image: url('images/globe.png'); background-image: url('images/globe.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.noglobe { background-position: -16px -16px;} /*.noglobe { background-position: -16px -16px;}*/
.icon.noglobe {
display: block; width: 24px; height: 24px;
background-size: 100% 100%;
background-image: url('images/noglobe.png');
background-repeat: no-repeat;
}
.no { background-position: -32px -16px;} .no { background-position: -32px -16px;}
.pause { background-position: -48px -16px;} .pause { background-position: -48px -16px;}
.play { background-position: -64px -16px;} .play { background-position: -64px -16px;}
@ -3810,7 +3821,7 @@ aside input[type='text'] {
max-height:150px; max-height:150px;
background-color:#ffffff; background-color:#ffffff;
overflow:auto; overflow:auto;
z-index:100000; z-index:102;
border:1px solid #cccccc; border:1px solid #cccccc;
} }
.acpopupitem { .acpopupitem {
@ -3884,16 +3895,15 @@ ul.notifications-menu-popup {
display: none; display: none;
width: 10em; width: 10em;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px 0.3em;
list-style: none; list-style: none;
z-index: 100000; right: -60px;
right: -55px;
} }
#nav-notifications-menu { #nav-notifications-menu {
width: 300px; width: 300px;
/* max-height: 400px;*/ /* max-height: 400px;*/
height: auto; height: auto;
overflow-y: scroll;overflow-style:scrollbar; /* overflow-y: scroll;overflow-style:scrollbar;*/
background-color:#FFFFFF; background-color:#FFFFFF;
/* -moz-border-radius: 5px;*/ /* -moz-border-radius: 5px;*/
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
@ -3902,6 +3912,7 @@ ul.notifications-menu-popup {
/* -moz-box-shadow: 3px 3px 5px #555;*/ /* -moz-box-shadow: 3px 3px 5px #555;*/
-webkit-box-shadow: 3px 3px 5px #555; -webkit-box-shadow: 3px 3px 5px #555;
box-shadow: 3px 3px 5px #555; box-shadow: 3px 3px 5px #555;
/* z-index: 103;*/
} }
#nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; } #nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; }
#nav-notifications-menu img { float: left; margin-right: 5px; } #nav-notifications-menu img { float: left; margin-right: 5px; }

View file

@ -4,7 +4,7 @@
* Name: Frost--mobile version * Name: Frost--mobile version
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.11 * Version: Version 0.2.12
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */

View file

@ -19,4 +19,5 @@
window.allowGID = $allowgid; window.allowGID = $allowgid;
window.denyCID = $denycid; window.denyCID = $denycid;
window.denyGID = $denygid; window.denyGID = $denygid;
window.aclInit = "true";
</script> </script>

View file

@ -0,0 +1,84 @@
<!DOCTYPE html>
<html>
<head>
<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
<style>
.panel_wrapper div.current{.overflow: auto; height: auto!important; }
.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
.filebrowser ul{ list-style-type: none; padding:0px; }
.filebrowser.folders a { display: block; padding: 0.3em }
.filebrowser.folders a:hover { background-color: #f0f0ee; }
.filebrowser.files.image { overflow: auto; height: auto; }
.filebrowser.files.image img { height:100px;}
.filebrowser.files.image li { display: block; padding: 5px; float: left; }
.filebrowser.files.image span { display: none;}
.filebrowser.files.file img { height:16px; vertical-align: bottom;}
.filebrowser.files a { display: block; padding: 0.3em}
.filebrowser.files a:hover { background-color: #f0f0ee; }
.filebrowser a { text-decoration: none; }
</style>
<script>
var FileBrowserDialogue = {
init : function () {
// Here goes your code for setting your custom things onLoad.
},
mySubmit : function (URL) {
//var URL = document.my_form.my_field.value;
var win = tinyMCEPopup.getWindowArg("window");
// insert information now
win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
// are we an image browser
if (typeof(win.ImageDialog) != "undefined") {
// we are, so update image dimensions...
if (win.ImageDialog.getImageData)
win.ImageDialog.getImageData();
// ... and preview if necessary
if (win.ImageDialog.showPreviewImage)
win.ImageDialog.showPreviewImage(URL);
}
// close popup window
tinyMCEPopup.close();
}
}
tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
</script>
</head>
<body>
<div class="tabs">
<ul >
<li class="current"><span>FileBrowser</span></li>
</ul>
</div>
<div class="panel_wrapper">
<div id="general_panel" class="panel current">
<div class="filebrowser path">
{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
</div>
<div class="filebrowser folders">
<ul>
{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
</ul>
</div>
<div class="filebrowser files $type">
<ul>
{{ for $files as $f }}
<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
{{ endfor }}
</ul>
</div>
</div>
</div>
<div class="mceActionPanel">
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -60,6 +60,8 @@
$jotplugins $jotplugins
</div> </div>
<!-- <span id="jot-display-location" style="display: none;"></span>-->
<div id="profile-rotator-wrapper" style="display: $visitor;" > <div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div> </div>

View file

@ -0,0 +1,11 @@
if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude.toFixed(4);
var lon = position.coords.longitude.toFixed(4);
$j('#jot-coord').val(lat + ', ' + lon);
$j('#profile-nolocation-wrapper').show();
});
}

View file

@ -17,7 +17,7 @@ $j(document).ready(function() {
});*/ });*/
if(typeof acl=="undefined"){ if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
acl = new ACL( acl = new ACL(
baseurl+"/acl", baseurl+"/acl",
[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ] [ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
@ -935,6 +935,37 @@ function jotAudioURL() {
function jotGetLocation() { function jotGetLocation() {
/* if(navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function(position) {
var lat = position.coords.latitude;
var lng = position.coords.longitude;
$j.ajax({
type: 'GET',
url: 'http://nominatim.openstreetmap.org/reverse?format=json&lat='+lat+'&lon='+lng,
jsonp: 'json_callback',
contentType: 'application/json',
dataType: 'jsonp',
success: function(json) {
console.log(json);
var locationDisplay = json.address.building+', '+json.address.city+', '+json.address.state;
$j('#jot-location').val(locationDisplay);
$j('#jot-display-location').html('Location: '+locationDisplay);
$j('#jot-display-location').show();
}
});
});
}
else {
reply = prompt(window.whereAreU, $j('#jot-location').val());
if(reply && reply.length) {
$j('#jot-location').val(reply);
}
}*/
reply = prompt(window.whereAreU, $j('#jot-location').val()); reply = prompt(window.whereAreU, $j('#jot-location').val());
if(reply && reply.length) { if(reply && reply.length) {
$j('#jot-location').val(reply); $j('#jot-location').val(reply);

File diff suppressed because one or more lines are too long

View file

@ -1309,6 +1309,10 @@ input#dfrn-url {
} }
.wall-item-content img { .wall-item-content img {
display: block;
margin-top: 10px;
margin-right: auto;
margin-left: auto;
max-width: 100%; max-width: 100%;
} }
@ -3418,7 +3422,13 @@ aside input[type='text'] {
background-image: url('images/globe.png'); background-image: url('images/globe.png');
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.noglobe { background-position: -16px -16px;} /*.noglobe { background-position: -16px -16px;}*/
.icon.noglobe {
display: block; width: 24px; height: 24px;
background-size: 100% 100%;
background-image: url('images/noglobe.png');
background-repeat: no-repeat;
}
.no { background-position: -32px -16px;} .no { background-position: -32px -16px;}
.pause { background-position: -48px -16px;} .pause { background-position: -48px -16px;}
.play { background-position: -64px -16px;} .play { background-position: -64px -16px;}

View file

@ -4,7 +4,7 @@
* Name: Frost * Name: Frost
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.9 * Version: Version 0.2.10
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */