Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
2bfba93940
29 changed files with 123 additions and 57 deletions
|
@ -1,11 +1,6 @@
|
||||||
<script type="text/javascript" src="$baseurl/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
|
<script type="text/javascript" src="$baseurl/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(document).ready(function() {
|
|
||||||
|
|
||||||
});
|
|
||||||
function tautogrow(id){
|
|
||||||
$("textarea#comment-edit-text-" +id).autogrow();
|
|
||||||
};
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$("iframe").each(function(){
|
$("iframe").each(function(){
|
||||||
var ifr_source = $(this).attr("src");
|
var ifr_source = $(this).attr("src");
|
||||||
|
@ -22,8 +17,27 @@ $(document).ready(function() {
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function yt_iframe() {
|
$(document).ready(function(){
|
||||||
|
$("#sortable_boxes").sortable({
|
||||||
|
update: function(event, ui) {
|
||||||
|
var BoxOrder = $(this).sortable("toArray").toString();
|
||||||
|
$.cookie("Boxorder", BoxOrder , { expires: 365, path: "/" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
var cookie = $.cookie("Boxorder");
|
||||||
|
if (!cookie) return;
|
||||||
|
var SavedID = cookie.split(",");
|
||||||
|
for (var Sitem=0, m = SavedID.length; Sitem < m; Sitem++) {
|
||||||
|
$("#sortable_boxes").append($("#sortable_boxes").children("#" + SavedID[Sitem]));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
function tautogrow(id){
|
||||||
|
$("textarea#comment-edit-text-" +id).autogrow();
|
||||||
|
};
|
||||||
|
|
||||||
|
function yt_iframe() {
|
||||||
$("iframe").load(function() {
|
$("iframe").load(function() {
|
||||||
var ifr_src = $(this).contents().find("body iframe").attr("src");
|
var ifr_src = $(this).contents().find("body iframe").attr("src");
|
||||||
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
|
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
|
||||||
|
|
|
@ -1,8 +1,13 @@
|
||||||
|
<div id="pos_null">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="sortable_boxes">
|
||||||
|
|
||||||
<div id="close_pages">
|
<div id="close_pages">
|
||||||
{{ if $page }}
|
{{ if $page }}
|
||||||
<div>$page</div>
|
<div>$page</div>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="close_profiles">
|
<div id="close_profiles">
|
||||||
{{ if $comunity_profilest_title }}
|
{{ if $comunity_profilest_title }}
|
||||||
|
@ -97,3 +102,4 @@ $nv.search
|
||||||
|
|
||||||
<div id="twitter">
|
<div id="twitter">
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
|
@ -1290,8 +1290,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1285,8 +1285,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1261,8 +1261,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1253,8 +1253,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1248,8 +1248,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1233,8 +1233,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1228,8 +1228,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1262,8 +1262,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1242,8 +1242,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1237,8 +1237,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1266,8 +1266,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1262,8 +1262,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1242,8 +1242,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1237,8 +1237,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1287,8 +1287,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1282,8 +1282,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1246,8 +1246,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1241,8 +1241,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
37
view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js
vendored
Normal file
37
view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -1235,8 +1235,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1229,8 +1229,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1210,8 +1210,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -1205,8 +1205,8 @@ right_aside .directory-photo { margin: 0px; }
|
||||||
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
|
||||||
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
|
||||||
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
right_aside .items-wrapper{ overflow: auto; width: 100%; }
|
||||||
right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; }
|
right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; }
|
||||||
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
|
||||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||||
#page-sidebar-right_aside .label {max-width: 128px;}
|
#page-sidebar-right_aside .label {max-width: 128px;}
|
||||||
|
|
|
@ -557,6 +557,7 @@ code {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
/* popup notifications */
|
/* popup notifications */
|
||||||
|
div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
|
||||||
div.jGrowl div.notice {
|
div.jGrowl div.notice {
|
||||||
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
|
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
|
|
|
@ -116,6 +116,10 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
||||||
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
|
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
|
||||||
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
|
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
|
||||||
|
|
||||||
|
//load jquery.ui.js
|
||||||
|
$jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js";
|
||||||
|
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $jqueryuiJS);
|
||||||
|
|
||||||
//load jquery.twitter.search.js
|
//load jquery.twitter.search.js
|
||||||
if($_COOKIE['close_twitter'] != "1") {
|
if($_COOKIE['close_twitter'] != "1") {
|
||||||
$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
|
$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
|
||||||
|
@ -133,6 +137,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
||||||
var footer_top = $(document).height() - 30;
|
var footer_top = $(document).height() - 30;
|
||||||
$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
|
$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</script>';
|
</script>';
|
||||||
|
|
||||||
//check if twitterbox is active and print
|
//check if twitterbox is active and print
|
||||||
|
@ -186,6 +193,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
||||||
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
|
$.cookie("close_lastusers","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
|
||||||
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
|
||||||
|
$.cookie("Boxorder",null, { expires: 365, path: "/" });
|
||||||
alert("Right-hand column was restored. Please refresh your browser");
|
alert("Right-hand column was restored. Please refresh your browser");
|
||||||
}
|
}
|
||||||
</script>';}
|
</script>';}
|
||||||
|
@ -467,7 +475,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
||||||
//Community_Pages at right_aside
|
//Community_Pages at right_aside
|
||||||
if($_COOKIE['close_pages'] != "1") {
|
if($_COOKIE['close_pages'] != "1") {
|
||||||
if(local_user()) {
|
if(local_user()) {
|
||||||
$page = '<div id="" >
|
$page = '
|
||||||
<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
|
<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
|
||||||
<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
|
<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
|
||||||
|
|
||||||
|
@ -493,7 +501,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
|
||||||
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
|
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
|
||||||
$contact["name"]."</a></li>";
|
$contact["name"]."</a></li>";
|
||||||
}
|
}
|
||||||
$page .= '</ul></div></div>';
|
$page .= '</ul></div>';
|
||||||
//if (sizeof($contacts) > 0)
|
//if (sizeof($contacts) > 0)
|
||||||
$aside['$page'] = $page;
|
$aside['$page'] = $page;
|
||||||
}}
|
}}
|
||||||
|
|
Loading…
Reference in a new issue