Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css
This commit is contained in:
friendica
2015-04-23 19:49:41 -07:00
1727 changed files with 56838 additions and 208980 deletions

View File

@@ -50,7 +50,7 @@ $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Location of PHP command line processor

View File

@@ -4,13 +4,23 @@
nav .badge {
position: relative;
top: -48px;
top: -49px;
float: left;
font-size: 10px;
padding: 2px 6px;
line-height: 20px;
padding: 0px 5px;
height: 20px;
min-width: 20px;
border-radius: 10px;
cursor: pointer;
}
@media screen and (max-width: 767px) {
nav .badge {
top: -46px;
}
}
nav i {
font-size: 14px;
}
@@ -68,6 +78,10 @@ code {
white-space: normal;
}
.form-control {
font-size: unset;
}
/* Bootstrap assumes that checkboxes are on the left of labels, while it's usually the opposite in Red */
.field.checkbox input[type="checkbox"] { margin-left: 0px; }
.field.checkbox label { padding-left: 0px; font-weight: 700}

45
view/css/colorbox.css Normal file
View File

@@ -0,0 +1,45 @@
#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:1; overflow:hidden;}
#cboxWrapper {max-width:none;}
#cboxOverlay{position:fixed; width:100%; height:100%;}
#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
#cboxContent{position:relative;}
#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
#cboxTitle{margin:0;}
#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
/*
User Style:
Change the following styles to modify the appearance of Colorbox. They are
ordered & tabbed in a way that represents the nesting of the generated HTML.
*/
#cboxOverlay{background:url(/images/overlay.png) repeat 0 0; opacity: 0.9; filter: alpha(opacity = 90);}
#colorbox{outline:0;}
#cboxContent{background:#fff; overflow:hidden;}
.cboxIframe{background:#fff;}
#cboxError{padding:50px; border:1px solid #ccc;}
#cboxLoadedContent{margin-bottom:28px;}
#cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
#cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
#cboxLoadingOverlay{background:url(/images/loading_background.png) no-repeat center center;}
#cboxLoadingGraphic{background:url(/images/loading.gif) no-repeat center center;}
/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
#cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
#cboxPrevious{position:absolute; bottom:0; left:0; background:url(/images/controls.png) no-repeat -75px 0; width:25px
; height:25px; text-indent:-9999px;}
#cboxPrevious:hover{background-position:-75px -25px;}
#cboxNext{position:absolute; bottom:0; left:27px; background:url(/images/controls.png) no-repeat -50px 0; width:25px;
height:25px; text-indent:-9999px;}
#cboxNext:hover{background-position:-50px -25px;}
#cboxClose{position:absolute; bottom:0; right:0; background:url(/images/controls.png) no-repeat -25px 0; width:25px;
height:25px; text-indent:-9999px;}
#cboxClose:hover{background-position:-25px -25px;}

View File

@@ -11,22 +11,31 @@ code {
.jothidden input {
border: 0px;
margin: 0px;
padding: 8px;
height: 39px;
width: 70%;
margin-bottom: 5px;
width: 100%;
}
.jothidden {
display:none;
}
#profile-jot-text {
#jot-title-wrap input,
#jot-pagetitle-wrap input {
padding: 8px;
margin-bottom: 5px;
}
.profile-jot-text {
height: 39px;
padding: 8px;
width: 100%;
}
.jot-attachment {
padding: 8px;
width: 100%;
}
#profile-jot-text-loading {
float: left;
padding: 30px 0px 0px 12px;
@@ -87,10 +96,6 @@ code {
margin-left:10px;
}
.lockview {
cursor: pointer;
}
.lockview-panel {
padding: 3px 20px;
}
@@ -261,7 +266,12 @@ a.wall-item-name-link {
cursor: default;
}
.item-verified {
color: darkgreen;
font-size: 1em !important;
}
.item-forged {
color: #FF0000;
font-size: 1.5em !important;
font-size: 1em !important;
}

View File

@@ -6,12 +6,8 @@ header #banner {
margin-right: auto;
}
nav {
height: 24px;
display: block;
}
section {
display: block;
min-height: 112px;
margin: 50px 10px;
}

View File

@@ -61,3 +61,7 @@
#adminpage table tr:hover { background-color: #bbc7d7; }
#adminpage .selectall { text-align: right; }
.channels_ckbx, .pending_ckbx, .users_ckbx {
margin-top: -5px !important;
}

32
view/css/mod_blocks.css Normal file
View File

@@ -0,0 +1,32 @@
#block-editor {
display: none;
}
#block-list-table {
width: 100%;
}
#block-list-table th:nth-child(1){
padding: 7px 3px 7px 10px;
white-space: nowrap;
}
#block-list-table td:nth-child(1){
padding: 7px 3px 7px 10px;
}
#block-list-table th:nth-child(5),
#block-list-table td:nth-child(5){
padding: 7px 3px;
white-space: nowrap;
}
#block-list-table th:nth-child(6),
#block-list-table td:nth-child(6){
padding: 7px 10px 7px 7px;
white-space: nowrap;
}
.webpage-list-tool {
padding: 7px 10px;
}

View File

@@ -8,23 +8,33 @@
float: left;
}
#event-summary, #start_text, #finish_text {
width: 300px;
#event-summary, #start_text {
width: 95%;
float: left;
}
#finish_text {
width: 100%;
float: left;
}
#event-category-wrap {
margin-top: 15px;
}
.event-cats {
margin-top: 15px;
width: 400px;
}
.bootstrap-tagsinput {
width: 100%;
}
.required {
float: left;
cursor: default;
}
#event-datetime-break {
@@ -39,3 +49,7 @@
margin-top: 15px;
}
#event-edit-preview-btn {
margin-right: 15px;
}

View File

@@ -2,7 +2,7 @@
#group-new-submit-wrapper {
margin-top: 30px;
}
/*
#group-edit-form > label {
float: left;
width: 300px;
@@ -16,7 +16,7 @@
#group-edit-form .field {
clear: both;
}
*/
#group-edit-submit-wrapper input {
clear: both;
width: 100px;
@@ -25,7 +25,7 @@
#group-edit-select-end {
clear: both;
}
/*
#group-edit-name-label {
float: left;
width: 175px;
@@ -44,7 +44,7 @@
}
*/
#group_members_select_label {
display: block;

3
view/css/mod_layouts.css Normal file
View File

@@ -0,0 +1,3 @@
#layout-editor {
display: none;
}

View File

@@ -45,8 +45,6 @@ img.mail-list-sender-photo {
#prvmail-rotator-wrapper {
float: left;
margin-top: 10px;
/* margin-right: 10px;
width: 24px; */
cursor: pointer;
}
@@ -79,16 +77,14 @@ img.mail-list-sender-photo {
float: right;
margin-right: 30px;
margin-top: 15px;
}
.mail-conv-delete-icon {
border: none;
margin-bottom: 5px;
}
.mail-conv-recall-wrapper {
float: right;
margin-right: 10px;
margin-top: 15px;
margin-bottom: 5px;
}
.mail-conv-outside-wrapper-end {

View File

@@ -1,3 +1,11 @@
#menulist > li {
margin-top: 15px;
}
#menu-list-table {
width: 100%;
}
#menu-list-table th:nth-child(2){
white-space: nowrap;
}
.menu-list-tool {
padding: 7px 10px;
}

View File

@@ -1,11 +1,13 @@
.menu-item-list {
list-style-type: none;
#mitem-list-table {
width: 100%;
}
.mitem-edit {
margin-right: 15px;
#mitem-list-table th:nth-child(1),
#mitem-list-table td:nth-child(1){
padding: 7px 3px 7px 10px;
white-space: nowrap;
}
.menu-item-list li {
margin-bottom: 15px;
}
.mitem-list-tool {
padding: 7px 10px;
}

View File

@@ -28,3 +28,9 @@
padding: 4px;
width: 100%;
}
#photo-map {
position: absolute;
left: -9999px;
top: -9999px;
}

View File

@@ -1,66 +1,3 @@
ul#settings-privacy-macros {
list-style-type: none;
margin: 0 0 10px 0;
padding: 0;
}
#settings-privacy-macros li {
margin-top: 5px;
}
#settings-permissions-wrapper {
margin-top: 15px;
}
#settings-default-perms {
margin-top: 15px;
}
#settings-perm-advanced {
margin-top: 15px;
}
.settings-common-perms {
margin-top: 15px;
}
#settings-permissions-wrapper .field {
margin-bottom: 10px;
}
#settings-permissions-wrapper .field > label {
width: 350px;
}
.settings-submit-wrapper {
margin-bottom: 10px;
}
#settings-remove-account-link {
margin-top: 15px;
margin-bottom: 45px;
}
#settings-notifications .field > label {
margin-left: 20px;
width: 330px;
}
#settings-notify-desc, #settings-activity-desc, #settings-vnotify-desc {
font-weight: bold;
margin-bottom: 15px;
}
#settings-menu-desc {
font-weight: bold;
float: left;
width: 350px;
}
#settings-channel-menu-div select {
float: left;
}
#settings-channel-menu-end {
clear: both;
margin-bottom: 15px;
.group {
margin-left: 10px;
}

View File

@@ -21,4 +21,3 @@
.cloud-index-tool {
padding: 7px 10px;
}

View File

@@ -1,6 +1,32 @@
.webpage-list-table tr {
height: 20px;
#webpage-editor {
display: none;
}
.webpage-list-table td {
padding: 5px;
#webpage-list-table {
width: 100%;
}
#webpage-list-table th:nth-child(1){
padding: 7px 3px 7px 10px;
white-space: nowrap;
}
#webpage-list-table td:nth-child(1){
padding: 7px 3px 7px 10px;
}
#webpage-list-table th:nth-child(7),
#webpage-list-table td:nth-child(7){
padding: 7px 3px;
white-space: nowrap;
}
#webpage-list-table th:nth-child(8),
#webpage-list-table td:nth-child(8){
padding: 7px 10px 7px 7px;
white-space: nowrap;
}
.webpage-list-tool {
padding: 7px 10px;
}

View File

@@ -7,7 +7,6 @@
margin-top: 0px;
}
.widget .nav-pills > li > a {
padding: 6px 10px;
}
@@ -50,8 +49,10 @@
}
/* fileas */
/* affinity slider */
#main-slider {
margin: 10px 7px 45px 7px;
}
/* posted date */
@@ -83,21 +84,6 @@ a.group-edit-tool {
li:hover .group-edit-icon {
opacity: 1;
}
/* affinity - slider */
#main-slider {
position: relative;
left: 5px;
width: 90%;
}
.slider {
margin-top: 10px;
margin-bottom: 45px;
}
/* photo albums */
/* Chatrooms */
@@ -112,10 +98,6 @@ li:hover .group-edit-icon {
margin-right: 5px;
}
.slider-container {
padding: 15px;
}
.rating-text-label {
margin-top: 30px;
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

20
view/en/cert_bad_eml.tpl Normal file
View File

@@ -0,0 +1,20 @@
This is the webserver at {{$sitename}};
A routine check indicates the SSL certificate for this website is
not valid. Your website cannot fully participate in the RedMatrix
until this is resolved. Please check your certificate and with your
certificate provider or service provider to ensure it is "browser valid"
and installed correctly. Self-signed certificates are NOT SUPPORTED
and NOT ALLOWED in the RedMatrix.
The check is performed by fetching a URL from your website with strict
SSL checking enabled, and if this fails, checking again with SSL
checks disabled. It's possible a transient error could produce this
message, but if any recent configuration changes have been made,
or if you receive this message more than once, please check your
certificate.
The error message is '{{$error}}'.
Apologies for the inconvenience,
your web server at {{$siteurl}}

17
view/en/cron_bad_eml.tpl Normal file
View File

@@ -0,0 +1,17 @@
This is the webserver at {{$sitename}};
A routine check indicates the scheduled maintenance tasks on this
website are not running. Please review your "cron" jobs or the
equivalent mechanism on your operating system and ensure these are
running. Please review the INSTALL instructions if you are seeing
this message for the first time. If these maintenance tasks have
been running normally until now, please check to see if anything
may have gone wrong to account for them not running currently.
This check is run approximately every three days.
The error message is '{{$error}}'.
The last successful execution was '{{$lastdate}}'.
Apologies for the inconvenience,
your web server at {{$siteurl}}

View File

@@ -71,7 +71,6 @@ $a->config['system']['access_policy'] = ACCESS_PRIVATE;
$a->config['system']['sellpage'] = '';
// Maximum size of an imported message, 0 is unlimited
// FIXME - NOT currently implemented.
$a->config['system']['max_import_size'] = 200000;

View File

@@ -50,7 +50,7 @@ $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Location of PHP command line processor

View File

@@ -50,7 +50,7 @@ $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Location of PHP command line processor

View File

@@ -51,7 +51,7 @@ $a->config['system']['max_import_size'] = 200000;
// taille maximale pour le téléversement de photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Lien absolu vers le compilateur PHP

View File

@@ -50,7 +50,7 @@ $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Location of PHP command line processor

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,18 +1,18 @@
function ACL(backend_url, preset){
function ACL(backend_url, preset) {
that = this;
that.url = backend_url;
that.kp_timer = null;
if (preset==undefined) preset = [];
if (preset === undefined) preset = [];
that.allow_cid = (preset[0] || []);
that.allow_gid = (preset[1] || []);
that.deny_cid = (preset[2] || []);
that.deny_gid = (preset[3] || []);
that.group_uids = [];
that.nw = 4; //items per row. should be calulated from #acl-list.width
that.list_content = $("#acl-list-content");
that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
that.showall = $("#acl-showall");
@@ -20,8 +20,8 @@ function ACL(backend_url, preset){
// set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes.
that.on_submit();
if (preset.length==0) that.showall.removeClass("btn-default").addClass("btn-warning");
if (preset.length === 0) that.showall.removeClass("btn-default").addClass("btn-warning");
/*events*/
$(document).ready(function() {
@@ -36,63 +36,63 @@ function ACL(backend_url, preset){
that.on_submit();
// }, 5000 );
});
}
// no longer called on submit - call to update whenever a change occurs to the acl list.
ACL.prototype.on_submit = function(){
ACL.prototype.on_submit = function() {
aclfileds = $("#acl-fields").html("");
$(that.allow_gid).each(function(i,v){
$(that.allow_gid).each(function(i,v) {
aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
});
$(that.allow_cid).each(function(i,v){
$(that.allow_cid).each(function(i,v) {
aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
});
$(that.deny_gid).each(function(i,v){
$(that.deny_gid).each(function(i,v) {
aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
});
$(that.deny_cid).each(function(i,v){
$(that.deny_cid).each(function(i,v) {
aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
});
// alert(aclfileds);
});
}
//areYouSure jquery plugin: recheck the form here
$('form').trigger('checkform.areYouSure');
};
ACL.prototype.search = function(){
ACL.prototype.search = function() {
var srcstr = $("#acl-search").val();
that.list_content.html("");
that.get(0,100, srcstr);
}
that.get(0, 100, srcstr);
};
ACL.prototype.on_search = function(event){
ACL.prototype.on_search = function(event) {
if (that.kp_timer) clearTimeout(that.kp_timer);
that.kp_timer = setTimeout( that.search, 1000);
}
};
ACL.prototype.on_showall = function(event){
event.preventDefault()
ACL.prototype.on_showall = function(event) {
event.preventDefault();
event.stopPropagation();
if (that.showall.hasClass("btn-warning")){
if (that.showall.hasClass("btn-warning")) {
return false;
}
that.showall.removeClass("btn-default").addClass("btn-warning");
that.allow_cid = [];
that.allow_gid = [];
that.deny_cid = [];
that.deny_gid = [];
that.update_view();
that.on_submit();
return false;
}
ACL.prototype.on_button_show = function(event){
event.preventDefault()
event.stopImmediatePropagation()
return false;
};
ACL.prototype.on_button_show = function(event) {
event.preventDefault();
event.stopImmediatePropagation();
event.stopPropagation();
/*that.showall.removeClass("selected");
@@ -101,11 +101,13 @@ ACL.prototype.on_button_show = function(event){
that.set_allow($(this).parent().attr('id'));
that.on_submit();
return false;
}
ACL.prototype.on_button_hide = function(event){
event.preventDefault()
event.stopImmediatePropagation()
};
ACL.prototype.on_button_hide = function(event) {
event.preventDefault();
event.stopImmediatePropagation();
event.stopPropagation();
/*that.showall.removeClass("selected");
@@ -114,48 +116,49 @@ ACL.prototype.on_button_hide = function(event){
that.set_deny($(this).parent().attr('id'));
that.on_submit();
return false;
}
ACL.prototype.set_allow = function(itemid){
return false;
};
ACL.prototype.set_allow = function(itemid) {
type = itemid[0];
id = itemid.substr(1);
switch(type){
id = itemid.substr(1);
switch(type) {
case "g":
if (that.allow_gid.indexOf(id)<0){
that.allow_gid.push(id)
if (that.allow_gid.indexOf(id)<0) {
that.allow_gid.push(id);
}else {
that.allow_gid.remove(id);
}
if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id);
break;
case "c":
if (that.allow_cid.indexOf(id)<0){
that.allow_cid.push(id)
if (that.allow_cid.indexOf(id)<0) {
that.allow_cid.push(id);
} else {
that.allow_cid.remove(id);
}
if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);
if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);
break;
}
that.update_view();
}
};
ACL.prototype.set_deny = function(itemid){
ACL.prototype.set_deny = function(itemid) {
type = itemid[0];
id = itemid.substr(1);
switch(type){
id = itemid.substr(1);
switch(type) {
case "g":
if (that.deny_gid.indexOf(id)<0){
that.deny_gid.push(id)
if (that.deny_gid.indexOf(id)<0) {
that.deny_gid.push(id);
} else {
that.deny_gid.remove(id);
}
if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id);
break;
case "c":
if (that.deny_cid.indexOf(id)<0){
that.deny_cid.push(id)
if (that.deny_cid.indexOf(id)<0) {
that.deny_cid.push(id);
} else {
that.deny_cid.remove(id);
}
@@ -163,67 +166,63 @@ ACL.prototype.set_deny = function(itemid){
break;
}
that.update_view();
}
};
ACL.prototype.update_view = function(){
if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
that.deny_gid.length==0 && that.deny_cid.length==0){
ACL.prototype.update_view = function() {
if (that.allow_gid.length === 0 && that.allow_cid.length === 0 &&
that.deny_gid.length === 0 && that.deny_cid.length === 0) {
that.showall.removeClass("btn-default").addClass("btn-warning");
/* jot acl */
$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
$('#jot-public').show();
$('.profile-jot-net input').attr('disabled', false);
if(typeof editor != 'undefined' && editor != false) {
$('#profile-jot-desc').html(ispublic);
}
$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
$('#jot-public').show();
$('.profile-jot-net input').attr('disabled', false);
if(typeof editor !== 'undefined' && editor !== false) {
$('#profile-jot-desc').html(ispublic);
}
} else {
that.showall.removeClass("btn-warning").addClass("btn-default");
/* jot acl */
$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
$('#jot-public').hide();
$('.profile-jot-net input').attr('disabled', 'disabled');
$('#profile-jot-desc').html('&nbsp;');
that.showall.removeClass("btn-warning").addClass("btn-default");
/* jot acl */
$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
$('#jot-public').hide();
$('.profile-jot-net input').attr('disabled', 'disabled');
$('#profile-jot-desc').html('&nbsp;');
}
$("#acl-list-content .acl-list-item").each(function(){
$("#acl-list-content .acl-list-item").each(function() {
$(this).removeClass("groupshow grouphide");
});
$("#acl-list-content .acl-list-item").each(function(){
$("#acl-list-content .acl-list-item").each(function() {
itemid = $(this).attr('id');
type = itemid[0];
id = itemid.substr(1);
id = itemid.substr(1);
btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-default");
bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-default");
switch(type){
switch(type) {
case "g":
var uclass = "";
if (that.allow_gid.indexOf(id)>=0){
if (that.allow_gid.indexOf(id)>=0) {
btshow.removeClass("btn-default").addClass("btn-success");
bthide.removeClass("btn-danger").addClass("btn-default");
uclass="groupshow";
}
if (that.deny_gid.indexOf(id)>=0){
if (that.deny_gid.indexOf(id)>=0) {
btshow.removeClass("btn-success").addClass("btn-default");
bthide.removeClass("btn-default").addClass("btn-danger");
uclass="grouphide";
uclass = "grouphide";
}
$(that.group_uids[id]).each(function(i,v) {
$(that.group_uids[id]).each(function(i, v) {
if(uclass == "grouphide")
$("#c"+v).removeClass("groupshow");
if(uclass != "") {
if(uclass !== "") {
var cls = $("#c"+v).attr('class');
if( cls == undefined)
if( cls === undefined)
return true;
var hiding = cls.indexOf('grouphide');
if(hiding == -1)
$("#c"+v).addClass(uclass);
}
});
break;
case "c":
if (that.allow_cid.indexOf(id)>=0){
@@ -233,45 +232,41 @@ ACL.prototype.update_view = function(){
if (that.deny_cid.indexOf(id)>=0){
btshow.removeClass("btn-success").addClass("btn-default");
bthide.removeClass("btn-default").addClass("btn-danger");
}
}
}
});
}
};
ACL.prototype.get = function(start,count, search){
ACL.prototype.get = function(start, count, search) {
var postdata = {
start:start,
count:count,
search:search,
}
start: start,
count: count,
search: search,
};
$.ajax({
type:'POST',
type: 'POST',
url: that.url,
data: postdata,
dataType: 'json',
success:that.populate
success: that.populate
});
}
};
ACL.prototype.populate = function(data){
ACL.prototype.populate = function(data) {
var height = Math.ceil(data.items.length / that.nw) * 42;
that.list_content.height(height);
$(data.items).each(function(){
html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable);
if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
if (this.uids !== undefined) that.group_uids[this.id] = this.uids;
//console.log(html);
that.list_content.append(html);
});
$("#acl-list-content .acl-list-item img[data-src]").each(function(i, el){
$("#acl-list-content .acl-list-item img[data-src]").each(function(i, el) {
// Replace data-src attribute with src attribute for every image
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");
});
that.update_view();
}
};

View File

@@ -4,7 +4,7 @@
* require jQuery, jquery.textcomplete
*/
function contact_search(term, callback, backend_url, type, extra_channels, spinelement) {
if(spinelement){
if(spinelement) {
$(spinelement).spin('tiny');
}
// Check if there is a cached result that contains the same information we would get with a full server-side search
@@ -12,13 +12,13 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine
if(!(bt in contact_search.cache)) contact_search.cache[bt] = {};
var lterm = term.toLowerCase(); // Ignore case
for(t in contact_search.cache[bt]) {
for(var t in contact_search.cache[bt]) {
if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results
$(spinelement).spin(false);
// Filter old results locally
var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one
var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one
matching.unshift({taggable:false, text: term, replace: term});
setTimeout(function() { callback(matching)} , 1); // Use "pseudo-thread" to avoid some problems
setTimeout(function() { callback(matching); } , 1); // Use "pseudo-thread" to avoid some problems
return;
}
}
@@ -28,17 +28,17 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine
count:100,
search:term,
type:type,
}
};
if(typeof extra_channels !== 'undefined' && extra_channels)
postdata['extra_channels[]'] = extra_channels;
$.ajax({
type:'POST',
url: backend_url,
data: postdata,
dataType: 'json',
success:function(data){
success: function(data){
// Cache results if we got them all (more information would not improve results)
// data.count represents the maximum number of items
if(data.items.length -1 < data.count) {
@@ -57,18 +57,18 @@ contact_search.cache = {};
function contact_format(item) {
// Show contact information if not explicitly told to show something else
if(typeof item.text === 'undefined') {
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick)
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick);
if(typeof desc === 'undefined') desc = '';
if(desc) desc = ' ('+desc+')';
return "<div class='{0}' title='{4}'><img src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link)
return "<div class='{0}' title='{4}'><img src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link);
}
else
return "<div>"+item.text+"</div>"
return "<div>" + item.text + "</div>";
}
function editor_replace(item) {
if(typeof item.replace !== 'undefined') {
return '$1$2'+item.replace;
return '$1$2' + item.replace;
}
// $2 ensures that prefix (@,@!) is preserved
@@ -77,7 +77,8 @@ function editor_replace(item) {
// 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id).
if(id.length > 16)
id = item.id.substring(0,16);
return '$1$2'+item.nick.replace(' ','') + '+' + id + ' ';
return '$1$2' + item.nick.replace(' ', '') + '+' + id + ' ';
}
function basic_replace(item) {
@@ -94,76 +95,71 @@ function submit_form(e) {
/**
* jQuery plugin 'editor_autocomplete'
*/
(function( $ ){
(function( $ ) {
$.fn.editor_autocomplete = function(backend_url, extra_channels) {
if (typeof extra_channels === 'undefined') extra_channels = false;
if (typeof extra_channels === 'undefined') extra_channels = false;
// Autocomplete contacts
contacts = {
match: /(^|\s)(@\!*)([^ \n]+)$/,
index: 3,
search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); },
replace: editor_replace,
template: contact_format,
}
// Autocomplete contacts
contacts = {
match: /(^|\s)(@\!*)([^ \n]+)$/,
index: 3,
search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); },
replace: editor_replace,
template: contact_format,
};
smilies = {
match: /(^|\s)(:[a-z]{2,})$/,
index: 2,
search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry['text'].indexOf(term) === 0 ? entry : null })) }) },
template: function(item) { return item['icon'] + item['text'] },
replace: function(item) { return "$1"+item['text'] + ' '; },
}
this.attr('autocomplete','off');
this.textcomplete([contacts,smilies],{className:'acpopup',zIndex:1020});
};
smilies = {
match: /(^|\s)(:[a-z]{2,})$/,
index: 2,
search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); },
template: function(item) { return item.icon + item.text; },
replace: function(item) { return "$1" + item.text + ' '; },
};
this.attr('autocomplete','off');
this.textcomplete([contacts,smilies], {className:'acpopup', zIndex:1020});
};
})( jQuery );
/**
* jQuery plugin 'search_autocomplete'
*/
(function( $ ){
(function( $ ) {
$.fn.search_autocomplete = function(backend_url) {
// Autocomplete contacts
contacts = {
match: /(^@)([^\n]{2,})$/,
index: 2,
search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); },
replace: basic_replace,
template: contact_format,
}
this.attr('autocomplete','off');
var a = this.textcomplete([contacts],{className:'acpopup',maxCount:100,zIndex: 1020,appendTo:'nav'});
a.on('textComplete:select', function(e,value,strategy) { submit_form(this); });
};
// Autocomplete contacts
contacts = {
match: /(^@)([^\n]{2,})$/,
index: 2,
search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); },
replace: basic_replace,
template: contact_format,
};
this.attr('autocomplete', 'off');
var a = this.textcomplete([contacts], {className:'acpopup', maxCount:100, zIndex: 1020, appendTo:'nav'});
a.on('textComplete:select', function(e, value, strategy) { submit_form(this); });
};
})( jQuery );
(function( $ ){
(function( $ ) {
$.fn.contact_autocomplete = function(backend_url, typ, autosubmit, onselect) {
if(typeof typ === 'undefined') typ = '';
if(typeof autosubmit === 'undefined') autosubmit = false;
if(typeof typ === 'undefined') typ = '';
if(typeof autosubmit === 'undefined') autosubmit = false;
// Autocomplete contacts
contacts = {
match: /(^)([^\n]+)$/,
index: 2,
search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); },
replace: basic_replace,
template: contact_format,
};
// Autocomplete contacts
contacts = {
match: /(^)([^\n]+)$/,
index: 2,
search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); },
replace: basic_replace,
template: contact_format,
}
this.attr('autocomplete','off');
var a = this.textcomplete([contacts], {className:'acpopup', zIndex:1020});
this.attr('autocomplete','off');
var a = this.textcomplete([contacts],{className:'acpopup',zIndex:1020});
if(autosubmit)
a.on('textComplete:select', function(e,value,strategy) { submit_form(this); });
if(typeof onselect !== 'undefined')
a.on('textComplete:select',function(e,value,strategy) { onselect(value); });
};
})( jQuery );
if(autosubmit)
a.on('textComplete:select', function(e,value,strategy) { submit_form(this); });
if(typeof onselect !== 'undefined')
a.on('textComplete:select', function(e, value, strategy) { onselect(value); });
};
})( jQuery );

10
view/js/jquery.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,8 @@
$(document).ready(function() {
/**
* JavaScript for mod/chat
*/
$(document).ready(function() {
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
@@ -7,10 +10,9 @@ $(document).ready(function() {
$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
$('#jot-public').hide();
});
if(selstr == null) {
if(selstr === null) {
$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
$('#jot-public').show();
}
}).trigger('change');
});
});

View File

@@ -1,17 +1,15 @@
function dirdetails(hash) {
$.get('dirprofile' + '?f=&hash=' + hash, function( data ) {
$.colorbox({ maxWidth: "50%", maxHeight: "75%", html: data });
$.colorbox({ maxWidth: "80%", maxHeight: "75%", scrolling: false, html: data });
});
}
var ratingVal = 0;
var ratingText = '';
var currentHash = '';
function fetchRatings(hash) {
$.get('prate/'+hash, function(data) {
$.get('prate/' + hash, function(data) {
if(typeof(data.rating) !== 'undefined') {
ratingVal = data.rating;
ratingText = data.rating_text;
@@ -20,22 +18,21 @@ function fetchRatings(hash) {
});
}
function doRatings(hash) {
fetchRatings(hash);
}
function buildRatingForm(hash) {
var html = '<form id="ratings_form" action="prate" method="post"><input type="hidden" name="target" value="'+hash+'" /><div class="rating-desc">'+aStr['rating_desc']+'</div><input id="dir-rating-range" class="directory-slider" type="text" value="'+ratingVal+'" name="rating" style="display: none;" /><div class="rating-text-label">'+aStr['rating_text']+'<input type="text" name="rating_text" class="directory-rating-text" value="'+ratingText+'" /><br /><input name="submit" class="directory-rating-submit" type="submit" value="'+aStr['submit']+'" onclick="postRatings(); return false;"></form><div class="clear"></div><script>$("#dir-rating-range").jRange({ from: -10, to: 10, step: 1, showLabels: false, showScale: true, scale : [ "-10","-5","0","5","10" ], onstatechange: function(v) { $("#dir-rating-range").val(v); } });</script>';
var html = '<form id="ratings_form" action="prate" method="post"><input type="hidden" name="target" value="'+hash+'" /><div class="rating-desc">' + aStr.rating_desc + '</div><input id="dir-rating-range" class="directory-slider" type="text" value="' + ratingVal + '" name="rating" style="display: none;" /><div class="rating-text-label">' + aStr.rating_text + '<input type="text" name="rating_text" class="directory-rating-text" value="' + ratingText + '" /><br /><input name="submit" class="directory-rating-submit" type="submit" value="' + aStr.submit + '" onclick="postRatings(); return false;"></form><div class="clear"></div><script>$("#dir-rating-range").jRange({ from: -10, to: 10, step: 1, showLabels: false, showScale: true, scale: [ "-10","-5","0","5","10" ], onstatechange: function(v) { $("#dir-rating-range").val(v); } });</script>';
$.colorbox({maxwidth: "50%", maxHeight: "50%", html: html, close: 'X' });
$.colorbox({maxwidth: "50%", maxHeight: "50%", scrolling: false, html: html, close: 'X' });
currentHash = hash;
}
function postRatings() {
$.post('prate',$('#ratings_form').serialize(),function(data) {
$.post('prate', $('#ratings_form').serialize(), function(data) {
$.colorbox.remove();
$('#edited-'+currentHash).show();
$('#edited-' + currentHash).show();
},'json');
}

View File

@@ -1,35 +1,34 @@
/**
* JavaScript for mod/events
*/
$(document).ready( function() { showHideFinishDate(); });
function showHideFinishDate() {
if( $('#id_nofinish').is(':checked'))
$('#event-finish-wrapper').hide();
else
$('#event-finish-wrapper').show();
}
function eventGetStart() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#startModal').modal();
$('#start-modal-OKButton').on('click', function() {
reply=$('#start-date').val();
if(reply && reply.length) {
function showHideFinishDate() {
if( $('#id_nofinish').is(':checked'))
$('#event-finish-wrapper').hide();
else
$('#event-finish-wrapper').show();
}
function eventGetStart() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#startModal').modal();
$('#start-modal-OKButton').on('click', function() {
reply=$('#start-date').val();
if(reply && reply.length) {
$('#start-text').val(reply);
$('#startModal').modal('hide');
}
})
}
function eventGetFinish() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#finishModal').modal();
$('#finish-modal-OKButton').on('click', function() {
reply=$('#finish-date').val();
if(reply && reply.length) {
});
}
function eventGetFinish() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#finishModal').modal();
$('#finish-modal-OKButton').on('click', function() {
reply=$('#finish-date').val();
if(reply && reply.length) {
$('#finish-text').val(reply);
$('#finishModal').modal('hide');
}
})
}
});
}

View File

@@ -1,5 +1,7 @@
/**
* JavaScript used by mod/filestorage
*/
$(document).ready(function() {
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
@@ -7,11 +9,9 @@ $(document).ready(function() {
$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
$('#jot-public').hide();
});
if(selstr == null) {
if(selstr === null) {
$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
$('#jot-public').show();
}
}).trigger('change');
});
});

View File

@@ -1,11 +1,12 @@
/**
* JavaScript used by mod/mitem.
*/
$(document).ready(function() {
$("a#settings-default-perms-menu").colorbox({
'inline' : true,
'transition' : 'elastic'
$("a#settings-default-perms-menu").colorbox({
'inline' : true,
'transition' : 'elastic'
});
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
@@ -13,10 +14,9 @@ $(document).ready(function() {
$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
$('#jot-public').hide();
});
if(selstr == null) {
if(selstr === null) {
$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
$('#jot-public').show();
}
}).trigger('change');
});
});

View File

@@ -1,12 +1,16 @@
/**
* JavaScript used by mod/photos
*/
var ispublic = aStr['everybody'];
// is this variable used anywhere?
var ispublic = aStr.everybody;
$(document).ready(function() {
$(document).ready(function() {
$(document).ready(function() {
$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
$("#photo-edit-newtag").val('@' + data.name);
});
});
});
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
@@ -15,10 +19,9 @@ $(document).ready(function() {
$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
$('#jot-public').hide();
});
if(selstr == null) {
if(selstr === null) {
$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
$('#jot-public').show();
}
}).trigger('change');
});
});

View File

@@ -1,29 +1,29 @@
$(document).ready(function() {
$("#register-email").blur(function() {
var zreg_email = $("#register-email").val();
$.get("register/email_check.json?f=&email=" + encodeURIComponent(zreg_email),function(data) {
$("#register-email-feedback").html(data.message);
zFormError("#register-email-feedback",data.error);
});
});
$("#register-password").blur(function() {
if(($("#register-password").val()).length < 6 ) {
$("#register-password-feedback").html(aStr['pwshort']);
zFormError("#register-password-feedback",true);
}
else {
$("#register-password-feedback").html("");
zFormError("#register-password-feedback",false);
}
});
$("#register-password2").blur(function() {
if($("#register-password").val() != $("#register-password2").val()) {
$("#register-password2-feedback").html(aStr['pwnomatch']);
zFormError("#register-password2-feedback",true);
}
else {
$("#register-password2-feedback").html("");
zFormError("#register-password2-feedback",false);
}
$(document).ready(function() {
$("#register-email").blur(function() {
var zreg_email = $("#register-email").val();
$.get("register/email_check.json?f=&email=" + encodeURIComponent(zreg_email), function(data) {
$("#register-email-feedback").html(data.message);
zFormError("#register-email-feedback",data.error);
});
});
$("#register-password").blur(function() {
if(($("#register-password").val()).length < 6 ) {
$("#register-password-feedback").html(aStr.pwshort);
zFormError("#register-password-feedback", true);
}
else {
$("#register-password-feedback").html("");
zFormError("#register-password-feedback", false);
}
});
$("#register-password2").blur(function() {
if($("#register-password").val() != $("#register-password2").val()) {
$("#register-password2-feedback").html(aStr.pwnomatch);
zFormError("#register-password2-feedback", true);
}
else {
$("#register-password2-feedback").html("");
zFormError("#register-password2-feedback", false);
}
});
});

View File

@@ -1,13 +1,12 @@
/**
* JavaScript used by mod/settings
*/
var ispublic = aStr['everybody'] ;
// is this used anywhere?
var ispublic = aStr.everybody;
$(document).ready(function() {
$('form').areYouSure(); // Warn user about unsaved settings
$("a#settings-default-perms-menu").colorbox({
'inline' : true,
'transition' : 'elastic'
});
$('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
$("#id_permissions_role").change(function() {
var role = $("#id_permissions_role").val();
@@ -24,13 +23,11 @@ $(document).ready(function() {
$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
$('#jot-public').hide();
});
if(selstr == null) {
if(selstr === null) {
$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
$('#jot-public').show();
}
}).trigger('change');
});
/**
@@ -137,7 +134,5 @@ function channel_privacy_macro(n) {
$('#id_profile_in_directory_onoff .on').removeClass('hidden');
$('#id_profile_in_directory_onoff .off').addClass('hidden');
$('#id_profile_in_directory').val(1);
}
}
}

View File

@@ -4,7 +4,7 @@ var ratingText = '';
var currentHash = '';
function fetchRatings(hash) {
$.get('prate/'+hash, function(data) {
$.get('prate/' + hash, function(data) {
if(typeof(data.rating) !== 'undefined') {
ratingVal = data.rating;
ratingText = data.rating_text;
@@ -13,22 +13,20 @@ function fetchRatings(hash) {
});
}
function doRatings(hash) {
fetchRatings(hash);
}
function buildRatingForm(hash) {
var html = '<form id="ratings_form" action="prate" method="post"><input type="hidden" name="target" value="'+hash+'" /><div class="rating-desc">'+aStr['rating_desc']+'</div><input id="dir-rating-range" class="directory-slider" type="text" value="'+ratingVal+'" name="rating" style="display: none;" /><div class="rating-text-label">'+aStr['rating_text']+'<input type="text" name="rating_text" class="directory-rating-text" value="'+ratingText+'" /><br /><input name="submit" class="directory-rating-submit" type="submit" value="'+aStr['submit']+'" onclick="postRatings(); return false;"></form><div class="clear"></div><script>$("#dir-rating-range").jRange({ from: -10, to: 10, step: 1, showLabels: false, showScale: true, scale : [ "-10","-5","0","5","10" ], onstatechange: function(v) { $("#dir-rating-range").val(v); } });</script>';
var html = '<form id="ratings_form" action="prate" method="post"><input type="hidden" name="target" value="' + hash + '" /><div class="rating-desc">' + aStr.rating_desc + '</div><input id="dir-rating-range" class="directory-slider" type="text" value="' + ratingVal + '" name="rating" style="display: none;" /><div class="rating-text-label">' + aStr.rating_text + '<input type="text" name="rating_text" class="directory-rating-text" value="' + ratingText + '" /><br><input name="submit" class="directory-rating-submit" type="submit" value="' + aStr.submit + '" onclick="postRatings(); return false;"></form><div class="clear"></div><script>$("#dir-rating-range").jRange({ from: -10, to: 10, step: 1, showLabels: false, showScale: true, scale: [ "-10","-5","0","5","10" ], onstatechange: function(v) { $("#dir-rating-range").val(v); } });</script>';
$.colorbox({maxwidth: "50%", maxHeight: "50%", html: html, close: 'X' });
currentHash = hash;
}
function postRatings() {
$.post('prate',$('#ratings_form').serialize(),function(data) {
$.post('prate', $('#ratings_form').serialize(), function(data) {
$.colorbox.remove();
$('#edited-'+currentHash).show();
},'json');
}
$('#edited-' + currentHash).show();
}, 'json');
}

View File

@@ -50,7 +50,7 @@ $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Location of PHP command line processor

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,5 @@
[region=aside]
[widget=findpeople][/widget]
[widget=dirsafemode][/widget]
[widget=dirsort][/widget]
[widget=dirtags][/widget]
[widget=suggestions][/widget]

View File

@@ -0,0 +1,3 @@
[region=aside]
[widget=design_tools][/widget]
[/region]

View File

@@ -0,0 +1,3 @@
[region=aside]
[widget=design_tools][/widget]
[/region]

View File

@@ -0,0 +1,3 @@
[region=aside]
[widget=design_tools][/widget]
[/region]

4
view/pdl/mod_id.pdl Normal file
View File

@@ -0,0 +1,4 @@
[region=aside]
[widget=fullprofile][/widget]
[/region]

View File

@@ -2,7 +2,6 @@
[region=aside]
[widget=collections][/widget]
[widget=archive][/widget]
[widget=suggestions][/widget]
[widget=savedsearch][/widget]
[widget=filer][/widget]

View File

@@ -1,4 +1,5 @@
[region=aside]
[widget=pubsites][/widget]
[widget=vcard][/widget]
[widget=rating][/widget]
[widget=suggestions][/widget]

View File

@@ -8,12 +8,12 @@ head_add_css('library/jRange/jquery.range.css');
head_add_css('view/css/conversation.css');
head_add_css('view/css/widgets.css');
head_add_css('library/justifiedGallery/dist/css/justifiedGallery.css');
head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css');
head_add_css('view/css/colorbox.css');
head_add_css('library/justifiedGallery/justifiedGallery.css');
head_add_js('jquery.js');
head_add_js('jquery-migrate-1.1.1.js');
head_add_js('library/justifiedGallery/dist/js/jquery.justifiedGallery.js');
//head_add_js('jquery-migrate-1.1.1.js');
head_add_js('library/justifiedGallery/jquery.justifiedGallery.js');
//head_add_js('jquery-compat.js');
head_add_js('spin.js');
@@ -21,13 +21,13 @@ head_add_js('jquery.spin.js');
head_add_js('jquery.textinputs.js');
head_add_js('autocomplete.js');
head_add_js('library/jquery-textcomplete/jquery.textcomplete.js');
head_add_js('library/colorbox/jquery.colorbox.js');
//head_add_js('library/colorbox/jquery.colorbox.js');
head_add_js('library/jquery.timeago.js');
head_add_js('library/readmore.js/readmore.js');
head_add_js('library/jquery_ac/friendica.complete.js');
head_add_js('library/tiptip/jquery.tipTip.minified.js');
//head_add_js('library/jquery_ac/friendica.complete.js');
//head_add_js('library/tiptip/jquery.tipTip.minified.js');
head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js');
//head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js');
head_add_js('library/cryptojs/components/core-min.js');
head_add_js('library/cryptojs/rollups/aes.js');
head_add_js('library/cryptojs/rollups/rabbit.js');
@@ -38,9 +38,9 @@ head_add_js('webtoolkit.base64.js');
head_add_js('main.js');
head_add_js('crypto.js');
head_add_js('library/jRange/jquery.range.js');
head_add_js('docready.js');
//head_add_js('docready.js');
head_add_js('library/colorbox/jquery.colorbox-min.js');
head_add_js('library/bootstrap-tagsinput/bootstrap-tagsinput.js');
head_add_js('library/jquery.AreYouSure/jquery.are-you-sure.js');
head_add_js('library/tableofcontents/jquery.toc.js');

View File

@@ -50,7 +50,7 @@ $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Location of PHP command line processor

View File

@@ -50,7 +50,7 @@ $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Location of PHP command line processor

View File

@@ -50,7 +50,7 @@ $a->config['system']['max_import_size'] = 200000;
// maximum size of uploaded photos
$a->config['system']['maximagesize'] = 800000;
$a->config['system']['maximagesize'] = 8000000;
// Location of PHP command line processor

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,4 @@
body {
main {
margin-left: auto;
margin-right: auto;
max-width: $body_width;
}

View File

@@ -1,29 +1,60 @@
@media screen and (min-width: 760px) {
.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;}
.navbar {min-height:25px !important;}
nav img {
height: 30px;
width: 30px;
margin: 2px 0px 1px 10px;
border-radius: 0px;
.navbar-nav > li > a {
padding-top:7px !important;
padding-bottom:3px !important;
}
.navbar {
min-height:25px !important;
}
nav img {
height: 30px;
width: 30px;
margin-top: 1px;
border-radius: 4px;
}
.navbar-left {
height: 30px;
}
.container-fluid {
min-height:30px;
}
.collapse .navbar-collapse {
min-height:30px;
}
#nav-search-text {
margin:6px 15px 4px 15px;
}
#nav-search-spinner {
margin: 16px 0px 0px 25px;
}
header #banner {
margin-top:5px;
}
nav .dropdown-menu,
nav .acpopup {
top: 31px !important;
}
nav .badge {
position: relative;
top: -31px;
float: right;
font-size: 10px;
padding: 2px 6px;
cursor: pointer;
}
#jGrowl.top-right {
top: 30px;
right: 15px;
}
}
.navbar-left{height: 30px;}
.container-fluid {min-height:30px;}
.collapse .navbar-collapse {min-height:30px;}
#nav-search-text {margin:5px;}
header #banner {margin-top:5px;}
nav .dropdown-menu {
top: 33px;}
nav .badge {
position: relative;
top: -30px;
float: right;
font-size: 10px;
padding: 2px 6px;
cursor: pointer;
}
#jGrowl.top-right {
top: 30px;
right: 15px;
}
}

View File

@@ -2,7 +2,7 @@
* Redbasic
*
* Based on duepuntozero Friendica style
* by Fabio Comuni <fabrix.xm@gmail.com>
* Originally by Fabio Comuni <fabrix.xm@gmail.com>
*/
@@ -24,6 +24,10 @@ body {
height: 100%;
}
main {
max-width: $main_width;
}
h1, .h1, h2, .h2 {
font-size: 1.667em;
}
@@ -81,7 +85,11 @@ a.btn-default {
color: #333;
}
a.btn-success {
a.btn-success,
a.btn-danger,
a.btn-info,
a.btn-warning,
a.btn-primary {
color: #fff;
}
@@ -98,21 +106,21 @@ textarea {
input {
padding: 5px;
line-height: 1.5;
border: 1px solid $input_border;
border: 1px solid #ccc;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
}
input[type="submit"] {
background-color: $input_bgsubmit;
background-color: #F0F0F0;
font-weight: bold;
color: $input_linksubmit;
color: #0080FF;
text-decoration: none;
padding: 6px 12px;
}
button, input, optgroup, select, textarea {
color: #000;
input, optgroup, select, textarea {
color: #333;
}
pre code {
@@ -183,17 +191,6 @@ header {
padding: 10px;
}
.info-message {
font-size: 1.1em;
border: 1px solid #444;
background-color: $infomess_bgcolour;
padding: 10px;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
}
nav #banner #logo-text a {
font-size: 40px;
font-weight: bold;
@@ -262,7 +259,7 @@ footer {
}
#theme-preview {
margin: 15px 0 15px 150px;
margin: 15px 0px;
}
.fakebutton {
@@ -288,75 +285,11 @@ footer {
margin-bottom: 10px;
}
#main-login {
#login-main {
max-width: 300px;
margin-top: 50px;
}
#main-login #id_username, #main-login #id_password {
width: 200px;
padding: 10px;
float: left;
}
#main-login #id_remember {
float: left;
padding: 0;
margin-bottom: 0;
margin-left: 0;
width: 20px;
}
#main-login .field.checkbox > label {
margin-bottom: 0;
float: left;
width: 100px;
padding-left: 0;
}
#main-login .field_end {
clear: both;
}
#main-login .field.input label, #main-login .field.password label {
float: left;
width: 100px;
}
#login_standard {
width: 350px;
float: left;
}
#login_standard input,
#login_openid input {
width: 180px;
}
#login-extra-links {
clear: both;
width: 300px;
}
#register-link {
float: left;
margin-left: 100px;
}
#lost-password-link {
float: right;
}
#login-standard-end {
clear: both;
}
#login-submit-button {
margin-left: 100px;
margin-top: 10px;
}
#cropimage-wrapper, #cropimage-preview-wrapper {
float: left;
padding: 30px;
@@ -371,20 +304,7 @@ footer {
font-weight: bold;
}
#profile-edit-wrapper .field {
margin-top: 20px;
}
#profile-edit-wrapper .field > label {
width: 175px;
}
#profile-edit-wrapper .field input[type="text"] {
width: 220px;
}
#profile-edit-links {
max-width: $converse_width;
padding-top: 15px;
padding-bottom: 15px;
}
@@ -422,10 +342,11 @@ footer {
margin-bottom: 10px;
padding: 10px;
background-color: $comment_item_colour;
border-bottom: 1px solid $widget_brdrcolour;
border-bottom: 1px solid rgba(238,238,238,0.8);
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
word-wrap: break-word;
}
.vcard dl {
@@ -573,23 +494,6 @@ footer {
font-size: 0.7em;
}
#cboxContent {
color: $dirpopup_txtcol;
margin: 5px;
}
#cboxClose {
margin: 10px;
}
#colorbox {
margin: 5px;
}
#cboxContent a {
color: $dirpopup_linkcol;
}
.app-name {
overflow: none;
}
@@ -617,8 +521,8 @@ footer {
.pager-prev,
.pager-next,
.pager_n {
border: 1px solid $editbuttons_bordercolour;
background: $editbuttons_bgcolour;
border: 1px solid #ccc;
background: transparent;
padding: 4px;
}
@@ -719,16 +623,6 @@ footer {
}
.pmenu {
border-bottom: 1px solid #eec;
padding: 8px;
margin-top: 5px;
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
}
.pmenu.horizontal {
padding: 0 0 0 0;
border-bottom: none;
@@ -754,7 +648,6 @@ footer {
.group-delete-wrapper {
float: right;
margin-right: 50px;
}
.rconnect {
@@ -798,7 +691,7 @@ a.rateme, div.rateme {
width: 100%;
float: left;
background-color: $comment_item_colour;
border-bottom: 1px solid $widget_brdrcolour;
border-bottom: 1px solid rgba(238,238,238,0.8);
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
@@ -882,7 +775,7 @@ a.rateme, div.rateme {
height: 20px;
margin: 15px;
padding: 0px 5px 0px 5px;
border-radius: 10px;
border-radius: $radiuspx;
border-color: $nav_bd;
background-color: $search_background;
transition: background-color 300ms ease 0s;
@@ -974,14 +867,13 @@ nav .acpopup {
.vevent {
max-width: 100%;
margin-left: 10px;
margin-right: 10px;
margin: 10px;
padding: 10px;
border: 1px solid #CCCCCC;
}
.vevent .event-summary {
margin-left: 10px;
margin-right: 10px;
margin: 10px;
font-weight: bold;
}
@@ -998,7 +890,7 @@ nav .acpopup {
margin-bottom: 10px;
}
.edit-event-link, .plink-event-link {
.edit-event-link, .plink-event-link, .drop-event-link {
float: left;
margin-top: 4px;
margin-right: 4px;
@@ -1027,6 +919,7 @@ nav .acpopup {
.event-start .dtstart, .event-end .dtend {
float: right;
margin-right: 10px;
}
.event-list-date {
@@ -1053,13 +946,23 @@ nav .acpopup {
}
.fc-state-highlight {
background: none repeat scroll 0% 0% $cal_bgcolour !important;
background: none repeat scroll 0% 0% #FCF8E3 !important;
}
#cboxOverlay {
z-index: 1050;
}
#colorbox {
border: 0px solid $fancybox_bgcolour;
background-color: $fancybox_bgcolour;
z-index: 9;
z-index: 1051;
}
#cboxContent {
padding: 3px;
border: 0px solid #fff;
border-radius: $radiuspx;
background-color: #fff;
z-index: 1052;
}
.settings-block {
@@ -1199,8 +1102,6 @@ nav .acpopup {
.required {
color: #ff0000;
font-size: 1.8rem;
margin-left: 5px;
}
@@ -1263,71 +1164,6 @@ nav .acpopup {
}
/**
* Form fields
*/
.field {
margin-bottom: 10px;
/* padding-bottom: 10px; */
overflow: auto;
width: 100%
}
.field > label {
float: left;
width: 350px;
}
.field input,
.field textarea {
width: 400px;
}
.field textarea { height: 100px; }
.field_help {
display: block;
margin-left: 350px;
color: #666666;
}
.field input[type="checkbox"] {
width: 16px;
}
.field .onoff {
float: left;
width: 80px;
margin-right: 15px;
}
.field .onoff a {
display: block;
border:1px solid #666666;
background-image:url("../../../../images/onoff.jpg");
background-repeat: no-repeat;
padding: 4px 2px 2px 2px;
height: 24px;
text-decoration: none;
}
.field .onoff .off {
border-color:#666666;
padding-left: 40px;
background-position: left center;
background-color: #cccccc;
color: #666666;
text-align: right;
}
.field .onoff .on {
border-color:#204A87;
padding-right: 40px;
background-position: right center;
background-color: #D7E3F1;
color: #204A87;
text-align: left;
}
.hidden { display: none!important; }
.field.radio .field_help { margin-left: 0px; }
.field.checkbox .field_help { display: inline; margin-left: 10px; }
/**
@@ -1400,14 +1236,6 @@ div.jGrowl div.jGrowl-notification {
border-top: none;
}
#search-text-ac .autocomplete {
margin-top: 2px;
margin-left: $radiuspx;
border: 1px solid #ccc;
border-top: none;
width: calc(197px - $radiuspx * 2) !important;
}
#recip-ac .autocomplete,
#poke-recip-ac .autocomplete,
#id-name-ac .autocomplete,
@@ -1514,13 +1342,7 @@ header {
}
.notify-seen a {
background: $notifyseen_bgcolour;
color: $notifyseen_linkcolour !important;
}
.notify-seen a:hover {
background: $notifyseen_bghover;
color: $notifyseen_linkhover !important;
background: #ddd;
}
#page-spinner {
@@ -1532,10 +1354,6 @@ header {
clear: both;
}
.modal-content {
background-color: $acl_bgcolour;
}
#acl-search {
margin-top: 20px;
padding: 8px;
@@ -1553,7 +1371,7 @@ header {
#acl-list {
display: block;
border: 1px solid $acl_bordercolour;
border: 1px solid #ccc;
overflow: auto;
clear: both;
min-height: 62px;
@@ -1565,8 +1383,9 @@ header {
}
.acl-list-item {
width: 48%; /* fallback if browser does not support calc() */
width: calc(50% - 10px);
border: 1px solid $acl_bordercolour;
border: 1px solid #ccc;
margin: 0px 0px 10px 10px;
padding: 5px;
float: left;
@@ -1602,11 +1421,6 @@ header {
.acl-button-hide {
float: right;
margin-left: 5px;
$aclbutton_linkcolour
}
#acl-showall {
$aclbutton_linkcolour
}
.contact-block-content {
@@ -1623,50 +1437,50 @@ header {
.shared_header img { margin-right: 10px; }
.tag1 {
font-size : 1.0em !important;
font-size : 0.9em !important;
}
.tag2 {
font-size : 1.2em !important;
font-size : 1.0em !important;
}
.tag3 {
font-size : 1.4em !important;
font-size : 1.1em !important;
}
.tag4 {
font-size : 1.6em !important;
font-size : 1.2em !important;
}
.tag5 {
font-size : 1.8em !important;
font-size : 1.3em !important;
}
.tag6 {
font-size : 2.0em !important;
font-size : 1.4em !important;
}
.tag7 {
font-size : 2.2em !important;
font-size : 1.5em !important;
}
.tag8 {
font-size : 2.4em !important;
font-size : 1.6em !important;
}
.tag9 {
font-size : 2.6em !important;
font-size : 1.7em !important;
}
.tag10 {
font-size : 2.8em !important;
font-size : 1.8em !important;
}
@@ -1695,7 +1509,7 @@ margin-right: 50px;
}
a .drop-icons {
color: $toolicon_colour;;
color: $toolicon_colour;
font-size: 1.2em;
text-decoration: none;
}
@@ -1704,6 +1518,10 @@ a .drop-icons:hover {
color: #FF0000;
}
.lockview {
cursor: pointer;
}
.permission-inherited {
float: left;
margin-right: 10px;
@@ -1726,18 +1544,6 @@ a .drop-icons:hover {
font-size: 1.8em;
}
.design-tools ul {
list-style-type: none;
}
.design-icons {
margin-right: 10px;
}
.design-icons:hover {
text-decoration: none;
}
#menulist {
list-style-type: none;
}
@@ -1748,7 +1554,16 @@ text-decoration: none;
}
#adminpage table tr:hover {
background-color: $admintable_hoverbgcol;
background-color: #BBC7D7;
}
table {
border-spacing: 2px;
max-width: 100%;
}
th,td {
padding: 3px;
}
/* message */
@@ -1760,10 +1575,6 @@ img.mail-list-sender-photo {
/* jot */
#profile-jot-wrapper {
max-width: $converse_width;
}
.jothidden {
font-weight: bold;
border-radius: $radiuspx;
@@ -1777,11 +1588,14 @@ img.mail-list-sender-photo {
font-weight: bold;
}
.jothidden >input, .jothidden >input {
border: 1px solid #fff;
.jothidden > input {
border: 1px solid $bgcolour;
background-color: $bgcolour;
}
.jothidden >input:hover, .jothidden >input:focus {
.jothidden > input:hover,
.jothidden > input:focus {
border: 1px solid #cccccc;
background-color: #fff;
}
#profile-jot-text {
@@ -1832,10 +1646,6 @@ img.mail-list-sender-photo {
margin-left: $comment_indent;
}
.thread-wrapper.toplevel_item {
max-width: $converse_width;
}
.wall-item-content-wrapper {
background-color: $item_colour;
padding: 10px;
@@ -1849,25 +1659,22 @@ img.mail-list-sender-photo {
border-radius: $radiuspx;
}
.comment .wall-item-body {
padding-left: $comment_padding;
}
.wall-item-content-wrapper.comment {
background-color: $comment_item_colour;
border-left: $comment_border_left $comment_border_colour;
border-right: $comment_border_right $comment_border_colour;
border-bottom: $comment_border_bottom $comment_border_colour;
border-color: $comment_border_colour;
border-style: solid;
border-width: 0px 0px 0px 3px;
border-radius: 0px;
padding: 7px 10px 7px 7px;
}
.hide-comments-outer {
background-color: $comment_item_colour;
border-left: $comment_border_left $comment_border_colour;
border-right: $comment_border_right $comment_border_colour;
border-bottom: $comment_border_bottom $comment_border_colour;
border-top: 1px dashed #ccc;
border-color: $comment_border_colour;
border-top-color: #ccc;
border-style: solid;
border-top-style: dashed;
border-width: 1px 0px 0px 3px;
text-align: center;
border-radius: 0px;
}
@@ -1912,10 +1719,6 @@ img.mail-list-sender-photo {
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
}
.wall-item-ago .icon-ok {
color: darkgreen;
}
.wall-item-ago {
color: #777;
font-size: 0.833em;
@@ -1925,7 +1728,8 @@ img.mail-list-sender-photo {
font-size: 0.833em;
}
.wall-item-content {
.wall-item-content,
.page-body {
font-size: $font_size;
clear: both;
}
@@ -1981,7 +1785,7 @@ img.mail-list-sender-photo {
.widget {
background-color: $comment_item_colour;
border-bottom: 1px solid $widget_brdrcolour;
border-bottom: 1px solid rgba(238,238,238,0.8);
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
@@ -2013,11 +1817,11 @@ img.mail-list-sender-photo {
}
.abook-self {
background-color: $abookself_bgcolour;
background-color: #ffdddd;
}
.abook-pending-contact, .abook-permschange {
background: $abook_changebg;
background: orange;
}
.online-now {
@@ -2031,7 +1835,7 @@ img.mail-list-sender-photo {
.chat-item-text {
border-radius: $radiuspx;
background-color: $chat_txtbgcol;
background-color: #eee;
}
/* nav bootstrap */
@@ -2047,21 +1851,6 @@ nav .dropdown-menu {
border-top-left-radius: 0px;
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
background-color: $notify_bgcolour;
}
nav .dropdown-menu .divider{
background-color: $navmenu_bgchover;
}
nav .dropdown-menu>li>a{
color: $notify_linkcolour;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: $notify_linkcolour;
background-color: $navmenu_bgchover;
$navmenu_bgimage
}
#usermenu-caret {
@@ -2072,6 +1861,10 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: $nav_active_icon_colour;
}
.page-title {
margin: 7px 0px;
}
.section-title-wrapper {
padding: 7px 10px;
background-color: $item_colour;
@@ -2080,15 +1873,49 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
margin-bottom: 3px;
}
.section-title-wrapper h2 {
.section-title-wrapper h2,
.section-subtitle-wrapper h3 {
margin-top: 0px;
margin-bottom: 0px;
}
.section-subtitle-wrapper {
padding: 7px 10px;
background-color: $item_colour;
margin-bottom: 3px;
}
.section-content-tools-wrapper {
padding: 7px 10px;
background-color: $comment_item_colour;
margin-bottom: 3px
}
.section-content-info-wrapper {
padding: 21px 10px;
color: #31708f;
background-color: #d9edf7;
margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center;
}
.section-content-warning-wrapper {
padding: 21px 10px;
color: #8a6d3b;
background-color: #fcf8e3;
margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center;
}
.section-content-danger-wrapper {
padding: 21px 10px;
color: #a94442;
background-color: #f2dede;
margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center;
}
.section-content-wrapper {
@@ -2109,6 +1936,13 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
background-color: $item_colour;
}
[id^="webpage-list-item-"]:hover td,
[id^="block-list-item-"]:hover td,
[id^="menu-list-item-"]:hover td,
[id^="mitem-list-item-"]:hover td {
background-color: $item_colour;
}
nav ul li .undefined,
nav ul li .notify-seen,
nav ul li .notify-unseen
@@ -2118,6 +1952,18 @@ nav ul li .notify-unseen
/* bootstrap overrides */
.panel {
background-color: transparent;
border: 0px solid transparent;
border-radius: 0px;
-webkit-box-shadow: 0 0px 0px rgba(0, 0, 0, .0);
box-shadow: 0 0px 0px rgba(0, 0, 0, .0);
}
.panel-group .panel + .panel {
margin-top: 0px;
}
blockquote {
font-size: $font_size;
font-style: italic;
@@ -2294,35 +2140,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
}
.btn-default {
background-color: $editbuttons_bgcolour;
border-color: $editbuttons_bordercolour;
color: $editbuttons_colour;
text-shadow: none;
box-shadow: none;
}
.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
background-color: $editbuttons_bghover;
border-color: $editbuttons_bordercolourhover;
color: $input_colourhover;
text-decoration: $input_decohover;
}
.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
text-decoration: none;
}
.alert-info {
color: $alert_txtcolour;
background-color:$alert_bgcolour;
border-color: $alert_bordercol;
background-image: linear-gradient(to bottom, $alert_bgcolour 0px, $alert_gradientcol 100%);
}
.well {
background-color: $advperm_bgcolour;
border: 1px solid $advperm_bordercol;
background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
background-color: transparent;
}
@media screen and (max-width: 767px) {
@@ -2362,6 +2180,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
}
.acl-list-item {
width: 98%; /* fallback if browser does not support calc() */
width: calc(100% - 10px);
}
@@ -2387,6 +2206,12 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
border: 3px solid red !important;
}
.bb_rm-logo {
height: 1.3em;
width: auto;
margin-top:-3px;
}
.bootstrap-tagsinput .tag:before {
/* Copied from icon-asterisk, is there a better way to do it? */
font-family: FontAwesome;
@@ -2397,19 +2222,24 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
}
/* Modified original CSS to match input in Redbasic */
.bootstrap-tagsinput {
border-color:#fff;
background-color: #fff;
.jothidden .bootstrap-tagsinput {
border-color: $bgcolour;
background-color: $bgcolour;
box-shadow: none;
display: inline-block;
border-radius: $radiuspx;
cursor: text;
padding: 0 6px;
width: 70% !important;
padding: 0px 8px;
width: 100%;
}
.bootstrap-tagsinput .label {
font-size: 100%;
}
.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
border: 1px solid #cccccc;
border: 1px solid #ccc;
background-color: #fff;
}
/* Abusing theme-green is less work than makeing a new new one */
@@ -2417,9 +2247,8 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
/* Turn checkboxes into switches */
.field.checkbox .fieldhelp { vertical-align:top; }
.field.checkbox > div {
position: relative; width: 70px;
position: relative; width: 60px;
-webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
display:inline-block;
}
@@ -2430,9 +2259,20 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
.field.checkbox > div label {
display: block; overflow: hidden; cursor: pointer;
border: 2px solid #999999;
border-radius: 20px;
border: 1px solid #ccc;
border-radius: 4px;
margin:0px;
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.field.checkbox:hover label {
color: $link_colour;
}
.field.checkbox:hover > div label {
border-color: $link_colour;
}
.onoffswitch-inner {
@@ -2448,31 +2288,37 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
.onoffswitch-inner:before {
content: attr(data-on);
padding-left: 10px;
background-color: #EEEEEE;
padding-right: 21px;
background-color: $item_colour;
color: $font_colour;
text-align: right;
}
.onoffswitch-inner:after {
content: attr(data-off);
padding-right: 10px;
background-color: #EEEEEE; color: #999999;
text-align: right;
padding-left: 21px;
background-color: $item_colour; color: #ccc;
text-align: left;
}
.onoffswitch-switch {
display: block; width: 25px; margin-left: 6px; margin-right: 6px; margin-top:5%; margin-bottom:5%;
background: #A1A1A1;
border: 2px solid #999999; border-radius: 20px;
display: block; width: 15px; margin:4px;
background: #ccc;
border-radius: 10px;
position: absolute; top: 0; bottom: 0; right: 36px;
-moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s;
-o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
}
.field.checkbox > div > input:checked + label .onoffswitch-inner {
margin-left: 0;
margin-left: 0px;
}
.field.checkbox > div > input:checked + label .onoffswitch-switch {
right: -2px;
background-color: #27A1CA;
right: 0px;
background-color: #337AB7;
}
.channels_ckbx, .pending_ckbx, .users_ckbx {
margin-top: -5px !important;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

After

Width:  |  Height:  |  Size: 194 KiB

View File

@@ -1,39 +1,55 @@
/**
* redbasic theme specific JavaScript
*/
$(document).ready(function() {
$('#expand-aside').click(function() {
$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
$('main').toggleClass('region_1-on');
});
if($('aside').length && $('aside').html().length == 0) {
$('#expand-aside').hide();
}
$('#expand-tabs').click(function() {
if(!$('#tabs-collapse-1').hasClass('in')){
$('html, body').animate({ scrollTop: 0 }, 'slow');
// CSS3 calc() fallback (for unsupported browsers)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) {
$(window).resize(function() {
if($(window).width() < 767) {
$('main').css('width', $(window).width() + 231 );
} else {
$('main').css('width', '100%' );
}
});
}
$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
$('#css3-calc').remove(); // Remove the test element
$('#expand-aside').click(function() {
$('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
$('main').toggleClass('region_1-on');
});
if($('aside').length && $('aside').html().length === 0) {
$('#expand-aside').hide();
}
$('#expand-tabs').click(function() {
if(!$('#tabs-collapse-1').hasClass('in')){
$('html, body').animate({ scrollTop: 0 }, 'slow');
}
$('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
});
if($('#tabs-collapse-1').length === 0) {
$('#expand-tabs').hide();
}
$("input[data-role=cat-tagsinput]").tagsinput({
tagClass: 'label label-primary'
});
});
if($('#tabs-collapse-1').length == 0) {
$('#expand-tabs').hide();
}
});
$(document).ready(function(){
var doctitle = document.title;
function checkNotify() {
var notifyUpdateElem = document.getElementById('notify-update');
if(notifyUpdateElem !== null) {
if(notifyUpdateElem.innerHTML != "")
document.title = "("+notifyUpdateElem.innerHTML+") " + doctitle;
else
document.title = doctitle;
if(notifyUpdateElem.innerHTML !== "")
document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
else
document.title = doctitle;
}
};
}
setInterval(function () {checkNotify();}, 10 * 1000);
});

View File

@@ -35,7 +35,6 @@ function theme_content(&$a) {
$arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity");
$arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo");
$arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo");
$arr['sloppy_photos']=get_pconfig(local_channel(),"redbasic","sloppy_photos");
return redbasic_form($a, $arr);
}
@@ -73,7 +72,6 @@ function theme_post(&$a) {
set_pconfig(local_channel(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
set_pconfig(local_channel(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']);
}
}
@@ -100,8 +98,8 @@ if(feature_enabled(local_channel(),'expert'))
'$baseurl' => $a->get_baseurl(),
'$expert' => $expert,
'$title' => t("Theme settings"),
'$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices),
'$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar']),
'$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices),
'$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
'$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
'$nav_gradient_top' => array('redbasic_nav_gradient_top', t('Navigation bar gradient top color'), $arr['nav_gradient_top']),
'$nav_gradient_bottom' => array('redbasic_nav_gradient_bottom', t('Navigation bar gradient bottom color'), $arr['nav_gradient_bottom']),
@@ -120,17 +118,16 @@ if(feature_enabled(local_channel(),'expert'))
'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']),
'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']),
'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']),
'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], t('Example: 14px')),
'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
'$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']),
'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']),
'$converse_center' => array('redbasic_converse_center',t('Center conversation regions'),$arr['converse_center']),
'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
'$converse_center' => array('redbasic_converse_center',t('Center page content'),$arr['converse_center'], '', array(t('No'),t('Yes'))),
'$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']),
'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$arr['sloppy_photos'],t('Are you a clean desk or a messy desk person?')),
));
return $o;

View File

@@ -36,7 +36,6 @@ if(! $a->install) {
$converse_width=get_pconfig($uid,"redbasic","converse_width");
$converse_center=get_pconfig($uid,"redbasic","converse_center");
$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
$sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos');
$top_photo=get_pconfig($uid,'redbasic','top_photo');
$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
@@ -59,15 +58,23 @@ if(! $a->install) {
$schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
require_once ($schemefile);
}
if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) {
$schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css');
}
}
// If we haven't got a schema, load the default. We shouldn't touch this - we
// 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';
require_once ($schemefile);
}
if(file_exists('view/theme/redbasic/schema/default.css')) {
$schemecss = file_get_contents('view/theme/redbasic/schema/default.css');
}
}
// If we haven't got a schema, load the default. We shouldn't touch this - we
// 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';
require_once ($schemefile);
}
}
//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
@@ -89,10 +96,6 @@ if(! $a->install) {
$nav_icon_colour = "#999";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#f5f5f5";
if (! $navmenu_bgimage)
$navmenu_bgimage = "";
if (! $navtabs_borderc)
$navtabs_borderc = "rgba(204,204,204,0.8)";
if (! $navtabs_fontcolour)
@@ -145,8 +148,6 @@ if(! $a->install) {
$selected_active_colour = "#444";
if (! $selected_active_deco)
$selected_active_deco = "none";
if (! $widget_brdrcolour)
$widget_brdrcolour = "rgba(238,238,238,0.8)";
if (! $blockquote_colour)
$blockquote_colour = "#4d4d4d";
if (! $blockquote_bgcolour)
@@ -169,16 +170,6 @@ if(! $a->install) {
$notif_itemcolour = "#000";
if (! $notif_itemhovercolour)
$notif_itemhovercolour = "#000";
if (! $editbuttons_bgcolour)
$editbuttons_bgcolour = "transparent";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#ccc";
if (! $editbuttons_bordercolourhover)
$editbuttons_bordercolourhover = "#adadad";
if (! $editbuttons_colour)
$editbuttons_colour = "#333";
if (! $editbuttons_bghover)
$editbuttons_bghover = "#ebebeb";
if (! $dropdown_bgcolour)
$dropdown_bgcolour = "#FFF";
if (! $dropdown_textcolour)
@@ -205,95 +196,21 @@ if(! $a->install) {
$acpopup_tgbl_bgcolour = "#ddddff";
if (! $acpopup_hovercolour)
$acpopup_hovercolour = "#000";
if (! $notify_bgcolour)
$notify_bgcolour = "#fff";
if (! $notify_linkcolour)
$notify_linkcolour = "#333";
if (! $notify_bghover)
$notify_bghover = "#e7e7e7";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#ddd";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#333";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#e7e7e7";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#333";
if (! $notify_topmargin)
$notify_topmargin = "1px";
if (! $input_bgsubmit)
$input_bgsubmit = "#F0F0F0";
if (! $input_linksubmit)
$input_linksubmit = "#0080FF";
if (! $input_border)
$input_border = "#ccc";
if (! $input_colourhover)
$input_colourhover = "#333";
if (! $input_decohover)
$input_decohover = "none";
if (! $radius)
$radius = "4";
if (! $shadow)
$shadow = "0";
if(! $active_colour)
$active_colour = "#fff";
if (! $converse_width) {
$converse_width = "1024px";
}
if (! $acl_bgcolour)
$acl_bgcolour = "#fff";
if (! $acl_bordercolour)
$acl_bordercolour = "#ccc";
if (! $aclbutton_linkcolour)
$aclbutton_linkcolour = "";
if (! $abookself_bgcolour)
$abookself_bgcolour = "#ffdddd";
if (! $converse_width)
$converse_width = "1024";
if(! $top_photo)
$top_photo = '48px';
if(! $comment_indent)
$comment_indent = '0px';
if(! $reply_photo)
$reply_photo = '32px';
if(! $infomess_bgcolour)
$infomess_bgcolour = "#F0F0F0";
if(! $alert_txtcolour)
$alert_txtcolour = "#31708F";
if(! $alert_bgcolour)
$alert_bgcolour = "#D9EDF7";
if(! $alert_bordercol)
$alert_bordercol = "#BCE8F1";
if(! $alert_gradientcol)
$alert_gradientcol = "#B9DEF0";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#F5F5F5";
if(! $advperm_bordercol)
$advperm_bordercol = "#E3E3E3";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#E8E8E8";
if(! $cal_bgcolour)
$cal_bgcolour = "#FCF8E3";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#EEE";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#FFFFFF";
if (!$comment_padding)
$comment_padding="0px";
if (!$comment_border_left)
$comment_border_left="3px solid";
if (!$comment_border_right)
$comment_border_right="0px solid";
if (!$comment_border_top)
$comment_border_top="0px solid";
if (!$comment_border_bottom)
$comment_border_bottom="0px solid";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#BBC7D7";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="";
if (!$abook_changebg)
$abook_changebg="orange";
if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0;
@@ -308,7 +225,12 @@ if(! $a->install) {
if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
$body_width = (231 + $converse_width) . 'px'; // aside is 231px + converse width; have to find a way for calculation with 'px', cannot handle '%'
// left aside is 231px + converse width
$main_width = (231 + intval($converse_width));
// prevent main_width smaller than 768px
$main_width = (($main_width < 768) ? 768 : $main_width) . 'px';
$options = array (
'$nav_bg' => $nav_bg,
@@ -319,8 +241,6 @@ $options = array (
'$nav_bd' => $nav_bd,
'$nav_icon_colour' => $nav_icon_colour,
'$nav_active_icon_colour' => $nav_active_icon_colour,
'$navmenu_bgchover' => $navmenu_bgchover,
'$navmenu_bgimage' => $navmenu_bgimage,
'$navtabs_borderc' => $navtabs_borderc,
'$navtabs_fontcolour' => $navtabs_fontcolour,
'$navtabs_bgcolour' => $navtabs_bgcolour,
@@ -346,7 +266,6 @@ $options = array (
'$selected_active_colour' => $selected_active_colour,
'$selected_active_deco' => $selected_active_deco,
'$body_font_size' => $body_font_size,
'$widget_brdrcolour' => $widget_brdrcolour,
'$blockquote_colour' => $blockquote_colour,
'$blockquote_bgcolour' => $blockquote_bgcolour,
'$blockquote_bordercolour' => $blockquote_bordercolour,
@@ -359,11 +278,6 @@ $options = array (
'$pre_txtcolour' => $pre_txtcolour,
'$notif_itemcolour' => $notif_itemcolour,
'$notif_itemhovercolour' => $notif_itemhovercolour,
'$editbuttons_bgcolour' => $editbuttons_bgcolour,
'$editbuttons_bordercolour' => $editbuttons_bordercolour,
'$editbuttons_bordercolourhover' => $editbuttons_bordercolourhover,
'$editbuttons_colour' => $editbuttons_colour,
'$editbuttons_bghover' => $editbuttons_bghover,
'$dropdown_bgcolour' => $dropdown_bgcolour,
'$dropdown_textcolour' => $dropdown_textcolour,
'$dropdown_txtcolhover' => $dropdown_txtcolhover,
@@ -377,68 +291,30 @@ $options = array (
'$acpopup_bordercolour' => $acpopup_bordercolour,
'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour,
'$acpopup_hovercolour' => $acpopup_hovercolour,
'$notify_bgcolour' => $notify_bgcolour,
'$notify_linkcolour' => $notify_linkcolour,
'$notify_bghover' => $notify_bghover,
'$notifyseen_bgcolour' => $notifyseen_bgcolour,
'$notifyseen_linkcolour' => $notifyseen_linkcolour,
'$notifyseen_bghover' => $notifyseen_bghover,
'$notifyseen_linkhover' => $notifyseen_linkhover,
'$notify_topmargin' => $notify_topmargin,
'$input_bgsubmit' => $input_bgsubmit,
'$input_linksubmit' => $input_linksubmit,
'$input_border' => $input_border,
'$input_colourhover' => $input_colourhover,
'$input_decohover' => $input_decohover,
'$radius' => $radius,
'$shadow' => $shadow,
'$active_colour' => $active_colour,
'$converse_width' => $converse_width,
'$acl_bgcolour' => $acl_bgcolour,
'$acl_bordercolour' => $acl_bordercolour,
'$aclbutton_linkcolour' => $aclbutton_linkcolour,
'$abookself_bgcolour' => $abookself_bgcolour,
'$nav_float_min_opacity' => $nav_float_min_opacity,
'$nav_percent_min_opacity' => $nav_percent_min_opacity,
'$top_photo' => $top_photo,
'$reply_photo' => $reply_photo,
'$infomess_bgcolour' => $infomess_bgcolour,
'$alert_txtcolour' => $alert_txtcolour,
'$alert_bgcolour' => $alert_bgcolour,
'$alert_bordercol' => $alert_bordercol,
'$alert_gradientcol' => $alert_gradientcol,
'$advperm_bgcolour' => $advperm_bgcolour,
'$advperm_bordercol' => $advperm_bordercol,
'$advperm_gradientcol' => $advperm_gradientcol,
'$cal_bgcolour' => $cal_bgcolour,
'$chat_txtbgcol' => $chat_txtbgcol,
'$fancybox_bgcolour' => $fancybox_bgcolour,
'$pmenu_top' => $pmenu_top,
'$pmenu_reply' => $pmenu_reply,
'$wwtop' => $wwtop,
'$comment_indent' => $comment_indent,
'$body_width' => $body_width,
'$comment_padding' => $comment_padding,
'$comment_border_left' => $comment_border_left,
'$comment_border_right' => $comment_border_right,
'$comment_border_top' => $comment_border_top,
'$comment_border_bottom' => $comment_border_bottom,
'$admintable_hoverbgcol' => $admintable_hoverbgcol,
'$dirpopup_txtcol' => $dirpopup_txtcol,
'$dirpopup_linkcol' => $dirpopup_linkcol,
'$abook_changebg' => $abook_changebg,
'$main_width' => $main_width,
);
echo str_replace(array_keys($options), array_values($options), $x);
}
if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) {
echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css');
}
if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
}
if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) {
$x = file_get_contents('view/theme/redbasic/css/converse_center.css');
echo str_replace(array_keys($options), array_values($options), $x);
}
}
if($schemecss) {
echo $schemecss;
}

View File

@@ -1,8 +1,8 @@
<?php
head_add_css('library/font_awesome/css/font-awesome.min.css');
head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
head_add_css('library/bootstrap/css/bootstrap.min.css');
head_add_css('library/bootstrap/css/bootstrap.min.css');
head_add_css('library/bootstrap-tagsinput/bootstrap-tagsinput.css');
head_add_css('view/css/bootstrap-red.css');
head_add_css('library/datetimepicker/jquery.datetimepicker.css');
//head_add_css('library/colorpicker/css/colorpicker.css');
@@ -10,7 +10,8 @@ head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.c
require_once('view/php/theme_init.php');
head_add_js('library/bootstrap/js/bootstrap.min.js');
head_add_js('library/bootstrap/js/bootbox.min.js');
head_add_js('library/bootbox/bootbox.min.js');
head_add_js('library/bootstrap-tagsinput/bootstrap-tagsinput.js');
head_add_js('library/datetimepicker/jquery.datetimepicker.js');
//head_add_js('library/colorpicker/js/colorpicker.js');
head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');

View File

@@ -0,0 +1,11 @@
.comment .wall-item-body {
padding-left: 42px;
}
.wall-item-content-wrapper.comment {
border-width: 0px 1px 1px 1px;
}
.hide-comments-outer {
border-width: 1px 1px 1px 1px;
}

View File

@@ -1,19 +1,4 @@
<?php
if (!$comment_padding)
$comment_padding="42px";
if (!$comment_border_left)
$comment_border_left="1px solid";
if (!$comment_border_right)
$comment_border_right="1px solid";
if (!$comment_border_top)
$comment_border_top="1px solid";
if (!$comment_border_bottom)
$comment_border_bottom="1px solid";
if (! $radiuspx)
$radiuspx = "4";

View File

@@ -0,0 +1,152 @@
.vcard {
border-bottom: 1px solid #333;
}
#contact-block {
border-bottom: 1px solid #333;
}
.widget {
border-bottom: 1px solid #333;
}
.abook-pending-contact, .abook-permschange {
background: #402900;
}
#cboxContent a {
color: #000;
}
#cboxContent {
color: #111;
}
#adminpage table tr:hover {
background-color: #222;
}
#colorbox {
border: 0px solid #1E1E1E;
background-color: #1E1E1E;
}
.chat-item-text {
background-color: #222;
}
.fc-state-highlight {
background: none repeat scroll 0% 0% #333 !important;
}
.well {
background-color: #1E1E1E;
border: 1px solid #222;
background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
}
.alert-info {
color: #CCC;
background-color:#333;
border-color: #444;
background-image: linear-gradient(to bottom, #333 0px, #333 100%);
}
.abook-self {
background-color: #251111;
}
.acl-button-show,
.acl-button-hide {
color: #fff;
}
#acl-showall {
color: #fff;
}
#acl-list {
border: 1px solid #333;
}
.acl-list-item {
border: 1px solid #333;
}
.modal-content {
background-color: #111;
}
.btn-default {
background-color: #1e1e1e;
border-color: #222;
color: #ccc;
text-shadow: none;
box-shadow: none;
}
.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
background-color: #222;
border-color: #222;
color: #fff;
text-decoration: underline;
}
.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
text-decoration: none;
}
.pager_first,
.pager_last,
.pager_prev,
.pager_next,
.pager-prev,
.pager-next,
.pager_n {
border: 1px solid #222;
background: #1e1e1e;
}
input {
border: 1px solid #222;
}
input[type="submit"] {
background-color: #333;
color: #fff;
}
.notify-seen a {
background: #111;
color: #222 !important;
}
.notify-seen a:hover {
background: #222;
color: #ccc !important;
}
nav .dropdown-menu>li>a{
color: #fff;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #fff;
background-color: #222;
background-image: none;
}
nav .dropdown-menu .divider{
background-color: #222;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #fff;
background-color: #222;
background-image: none;
}
nav .dropdown-menu {
background-color: #000;
}

View File

@@ -16,10 +16,6 @@
$nav_icon_colour = "#999";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#222";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc)
$navtabs_borderc = "#333";
if (! $navtabs_fontcolour)
@@ -64,8 +60,6 @@
$toolicon_activecolour = '#fff';
if (! $font_colour)
$font_colour = "#ccc";
if (! $widget_brdrcolour)
$widget_brdrcolour = "#333";
if (! $blockquote_colour)
$blockquote_colour = "#ccc";
if (! $blockquote_bgcolour)
@@ -98,12 +92,6 @@
$acpopup_tgbl_bgcolour = "#333";
if (! $acpopup_hovercolour)
$acpopup_hovercolour = "#fff";
if (! $editbuttons_bgcolour)
$editbuttons_bgcolour = "#1e1e1e";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#222";
if (! $editbuttons_colour)
$editbuttons_colour = "#ccc";
if (! $editbuttons_bghover)
$editbuttons_bghover = "#222";
if (! $dropdown_bgcolour)
@@ -124,67 +112,3 @@
$dropdown_bordercol = "#222";
if (! $preview_backgroundimg)
$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
if (! $notify_bgcolour)
$notify_bgcolour = "#000";
if (! $notify_linkcolour)
$notify_linkcolour = "#FFF";
if (! $notify_bghover)
$notify_bghover = "#222";
if (! $notify_topmargin)
$notify_topmargin = "-1px";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#111";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#222";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#222";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#CCC";
if (! $input_bgsubmit)
$input_bgsubmit = "#333";
if (! $input_linksubmit)
$input_linksubmit = "#fff";
if (! $input_border)
$input_border = "#222";
if (! $input_colourhover)
$input_colourhover = "#fff";
if (! $input_decohover)
$input_decohover = "underline";
if (! $acl_bgcolour)
$acl_bgcolour = "#111";
if (! $acl_bordercolour)
$acl_bordercolour = "#333";
if (! $aclbutton_linkcolour)
$aclbutton_linkcolour = "color: #fff;";
if (! $abookself_bgcolour)
$abookself_bgcolour = "#251111";
if(! $infomess_bgcolour)
$infomess_bgcolour = "#333";
if(! $alert_txtcolour)
$alert_txtcolour = "#CCC";
if(! $alert_bgcolour)
$alert_bgcolour = "#333";
if(! $alert_bordercol)
$alert_bordercol = "#444";
if(! $alert_gradientcol)
$alert_gradientcol = "#333";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#1E1E1E";
if(! $advperm_bordercol)
$advperm_bordercol = "#222";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#1E1E1E";
if(! $cal_bgcolour)
$cal_bgcolour = "#333";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#222";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#1E1E1E";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#222";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="#111";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#000";
if (!$abook_changebg)
$abook_changebg="#402900";

View File

@@ -1,5 +0,0 @@
<?php
if (! $nav_colour)
$nav_colour = "black";

View File

@@ -0,0 +1,152 @@
.vcard {
border-bottom: 1px solid #fff;
}
#contact-block {
border-bottom: 1px solid #fff;
}
.widget {
border-bottom: 1px solid #fff;
}
.abook-pending-contact, .abook-permschange {
background: #fff;
}
#cboxContent a {
color: #fff;
}
#cboxContent {
color: #fff;
}
#adminpage table tr:hover {
background-color: #fff;
}
#colorbox {
border: 0px solid #fff;
background-color: #fff;
}
.chat-item-text {
background-color: #fff;
}
.fc-state-highlight {
background: none repeat scroll 0% 0% #fff !important;
}
.well {
background-color: #fff;
border: 1px solid #000;
background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
}
.alert-info {
color: #000;
background-color:#fff;
border-color: #000;
background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
}
.abook-self {
background-color: #fff;
}
.acl-button-show,
.acl-button-hide {
color: #000;
}
#acl-showall {
color: #000;
}
#acl-list {
border: 1px solid #fff;
}
.acl-list-item {
border: 1px solid #fff;
}
.modal-content {
background-color: #fff;
}
.btn-default {
background-color: #fff;
border-color: #000;
color: #111;
text-shadow: none;
box-shadow: none;
}
.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
background-color: #fff;
border-color: #000;
color: #000;
text-decoration: underline;
}
.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
text-decoration: none;
}
.pager_first,
.pager_last,
.pager_prev,
.pager_next,
.pager-prev,
.pager-next,
.pager_n {
border: 1px solid #000;
background: #fff;
}
input {
border: 1px solid #000;
}
input[type="submit"] {
background-color: #fff;
color: #000;
}
.notify-seen a {
background: #fff;
color: #fff !important;
}
.notify-seen a:hover {
background: #fff;
color: #000 !important;
}
nav .dropdown-menu>li>a{
color: #000;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #000;
background-color: #F5F5F5;
background-image: none;
}
nav .dropdown-menu .divider{
background-color: #F5F5F5;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #000;
background-color: #F5F5F5;
background-image: none;
}
nav .dropdown-menu {
background-color: #fff;
}

View File

@@ -16,10 +16,7 @@
$nav_icon_colour = "#111";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#000";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#F5F5F5";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc)
$navtabs_borderc = "#000";
if (! $navtabs_fontcolour)
@@ -64,8 +61,6 @@
$toolicon_activecolour = '#000';
if (! $font_colour)
$font_colour = "#000";
if (! $widget_brdrcolour)
$widget_brdrcolour = "#fff";
if (! $blockquote_colour)
$blockquote_colour = "#111";
if (! $blockquote_bgcolour)
@@ -98,14 +93,6 @@
$acpopup_tgbl_bgcolour = "#fff";
if (! $acpopup_hovercolour)
$acpopup_hovercolour = "#000";
if (! $editbuttons_bgcolour)
$editbuttons_bgcolour = "#fff";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#000";
if (! $editbuttons_colour)
$editbuttons_colour = "#111";
if (! $editbuttons_bghover)
$editbuttons_bghover = "#fff";
if (! $dropdown_bgcolour)
$dropdown_bgcolour = "#fff";
if (! $dropdown_textcolour)
@@ -124,67 +111,3 @@
$dropdown_bordercol = "#fff";
if (! $preview_backgroundimg)
$preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif";
if (! $notify_bgcolour)
$notify_bgcolour = "#fff";
if (! $notify_linkcolour)
$notify_linkcolour = "#000";
if (! $notify_bghover)
$notify_bghover = "#fff";
if (! $notify_topmargin)
$notify_topmargin = "-1px";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#fff";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#fff";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#fff";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#000";
if (! $input_bgsubmit)
$input_bgsubmit = "#fff";
if (! $input_linksubmit)
$input_linksubmit = "#000";
if (! $input_border)
$input_border = "#000";
if (! $input_colourhover)
$input_colourhover = "#000";
if (! $input_decohover)
$input_decohover = "underline";
if (! $acl_bgcolour)
$acl_bgcolour = "#fff";
if (! $acl_bordercolour)
$acl_bordercolour = "#fff";
if (! $aclbutton_linkcolour)
$aclbutton_linkcolour = "color: #000;";
if (! $abookself_bgcolour)
$abookself_bgcolour = "#fff";
if(! $infomess_bgcolour)
$infomess_bgcolour = "#fff";
if(! $alert_txtcolour)
$alert_txtcolour = "#000";
if(! $alert_bgcolour)
$alert_bgcolour = "#fff";
if(! $alert_bordercol)
$alert_bordercol = "#000";
if(! $alert_gradientcol)
$alert_gradientcol = "#fff";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#fff";
if(! $advperm_bordercol)
$advperm_bordercol = "#000";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#fff";
if(! $cal_bgcolour)
$cal_bgcolour = "#fff";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#fff";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#fff";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#fff";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="#fff";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#fff";
if (!$abook_changebg)
$abook_changebg="#fff";

View File

@@ -0,0 +1,152 @@
.vcard {
border-bottom: 1px solid #000;
}
#contact-block {
border-bottom: 1px solid #000;
}
.widget {
border-bottom: 1px solid #000;
}
.abook-pending-contact, .abook-permschange {
background: #000;
}
#cboxContent a {
color: #000;
}
#cboxContent {
color: #000;
}
#adminpage table tr:hover {
background-color: #000;
}
#colorbox {
border: 0px solid #000;
background-color: #000;
}
.chat-item-text {
background-color: #000;
}
.fc-state-highlight {
background: none repeat scroll 0% 0% #000 !important;
}
.well {
background-color: #000;
border: 1px solid #143D12;
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}
.alert-info {
color: #50f148;
background-color:#000;
border-color: #143D12;
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}
.abook-self {
background-color: #000;
}
.acl-button-show,
.acl-button-hide {
color: #fff;
}
#acl-showall {
color: #fff;
}
#acl-list {
border: 1px solid #000;
}
.acl-list-item {
border: 1px solid #000;
}
.modal-content {
background-color: #000;
}
.btn-default {
background-color: #000;
border-color: #143D12;
color: #32962D;
text-shadow: none;
box-shadow: none;
}
.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
background-color: #000;
border-color: #143D12;
color: #50f148;
text-decoration: underline;
}
.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
text-decoration: none;
}
.pager_first,
.pager_last,
.pager_prev,
.pager_next,
.pager-prev,
.pager-next,
.pager_n {
border: 1px solid #143D12;
background: #000;
}
input {
border: 1px solid #143D12;
}
input[type="submit"] {
background-color: #000;
color: #50f148;
}
.notify-seen a {
background: #000;
color: #000 !important;
}
.notify-seen a:hover {
background: #000;
color: #50f148 !important;
}
nav .dropdown-menu>li>a{
color: #50f148;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #50f148;
background-color: #143D12;
background-image: none;
}
nav .dropdown-menu .divider{
background-color: #143D12;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #50f148;
background-color: #143D12;
background-image: none;
}
nav .dropdown-menu {
background-color: #000;
}

View File

@@ -16,10 +16,6 @@
$nav_icon_colour = "#32962D";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#50f148";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#143D12";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc)
$navtabs_borderc = "#143D12";
if (! $navtabs_fontcolour)
@@ -64,8 +60,6 @@ if (! $navaside_bghover)
$toolicon_activecolour = '#50f148';
if (! $font_colour)
$font_colour = "#46D43F";
if (! $widget_brdrcolour)
$widget_brdrcolour = "#000";
if (! $blockquote_colour)
$blockquote_colour = "#32962D";
if (! $blockquote_bgcolour)
@@ -98,14 +92,6 @@ if (! $navaside_bghover)
$acpopup_tgbl_bgcolour = "#000";
if (! $acpopup_hovercolour)
$acpopup_hovercolour = "#50f148";
if (! $editbuttons_bgcolour)
$editbuttons_bgcolour = "#000";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#143D12";
if (! $editbuttons_colour)
$editbuttons_colour = "#32962D";
if (! $editbuttons_bghover)
$editbuttons_bghover = "#000";
if (! $dropdown_bgcolour)
$dropdown_bgcolour = "#000";
if (! $dropdown_textcolour)
@@ -124,67 +110,14 @@ if (! $navaside_bghover)
$dropdown_bordercol = "#143D12";
if (! $preview_backgroundimg)
$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
if (! $notify_bgcolour)
$notify_bgcolour = "#000";
if (! $notify_linkcolour)
$notify_linkcolour = "#50f148";
if (! $notify_bghover)
$notify_bghover = "#000";
if (! $notify_topmargin)
$notify_topmargin = "-1px";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#000";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#000";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#000";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#50f148";
if (! $input_bgsubmit)
$input_bgsubmit = "#000";
if (! $input_linksubmit)
$input_linksubmit = "#50f148";
if (! $input_border)
$input_border = "#143D12";
if (! $input_colourhover)
$input_colourhover = "#50f148";
if (! $input_decohover)
$input_decohover = "underline";
if (! $acl_bgcolour)
$acl_bgcolour = "#000";
if (! $acl_bordercolour)
$acl_bordercolour = "#000";
if (! $aclbutton_linkcolour)
$aclbutton_linkcolour = "color: #fff;";
if (! $abookself_bgcolour)
$abookself_bgcolour = "#000";
if(! $infomess_bgcolour)
$infomess_bgcolour = "#000";
if(! $alert_txtcolour)
$alert_txtcolour = "#50f148";
if(! $alert_bgcolour)
$alert_bgcolour = "#000";
if(! $alert_bordercol)
$alert_bordercol = "#143D12";
if(! $alert_gradientcol)
$alert_gradientcol = "#000";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#000";
if(! $advperm_bordercol)
$advperm_bordercol = "#143D12";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#000";
if(! $cal_bgcolour)
$cal_bgcolour = "#000";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#000";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#000";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#000";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="#000";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#000";
if (!$abook_changebg)
$abook_changebg="#000";

View File

@@ -0,0 +1,152 @@
.vcard {
border-bottom: 1px solid #000;
}
#contact-block {
border-bottom: 1px solid #000;
}
.widget {
border-bottom: 1px solid #000;
}
.abook-pending-contact, .abook-permschange {
background: #000;
}
#cboxContent a {
color: #000;
}
#cboxContent {
color: #000;
}
#adminpage table tr:hover {
background-color: #000;
}
#colorbox {
border: 0px solid #000;
background-color: #000;
}
.chat-item-text {
background-color: #000;
}
.fc-state-highlight {
background: none repeat scroll 0% 0% #000 !important;
}
.well {
background-color: #000;
border: 1px solid #fff;
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}
.alert-info {
color: #fff;
background-color:#000;
border-color: #fff;
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}
.abook-self {
background-color: #000;
}
.acl-button-show,
.acl-button-hide {
color: #fff;
}
#acl-showall {
color: #fff;
}
#acl-list {
border: 1px solid #000;
}
.acl-list-item {
border: 1px solid #000;
}
.modal-content {
background-color: #000;
}
.btn-default {
background-color: #000;
border-color: #fff;
color: #eee;
text-shadow: none;
box-shadow: none;
}
.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
background-color: #000;
border-color: #fff;
color: #fff;
text-decoration: underline;
}
.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
text-decoration: none;
}
.pager_first,
.pager_last,
.pager_prev,
.pager_next,
.pager-prev,
.pager-next,
.pager_n {
border: 1px solid #fff;
background: #000;
}
input {
border: 1px solid #fff;
}
input[type="submit"] {
background-color: #000;
color: #fff;
}
.notify-seen a {
background: #000;
color: #000 !important;
}
.notify-seen a:hover {
background: #000;
color: #fff !important;
}
nav .dropdown-menu>li>a{
color: #fff;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #fff;
background-color: #030303;
background-image: none;
}
nav .dropdown-menu .divider{
background-color: #030303;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #fff;
background-color: #030303;
background-image: none;
}
nav .dropdown-menu {
background-color: #000;
}

View File

@@ -16,10 +16,6 @@
$nav_icon_colour = "#eee";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#030303";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc)
$navtabs_borderc = "#fff";
if (! $navtabs_fontcolour)
@@ -64,8 +60,6 @@
$toolicon_activecolour = '#fff';
if (! $font_colour)
$font_colour = "#fff";
if (! $widget_brdrcolour)
$widget_brdrcolour = "#000";
if (! $blockquote_colour)
$blockquote_colour = "#eee";
if (! $blockquote_bgcolour)
@@ -98,14 +92,6 @@
$acpopup_tgbl_bgcolour = "#000";
if (! $acpopup_hovercolour)
$acpopup_hovercolour = "#fff";
if (! $editbuttons_bgcolour)
$editbuttons_bgcolour = "#000";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#fff";
if (! $editbuttons_colour)
$editbuttons_colour = "#eee";
if (! $editbuttons_bghover)
$editbuttons_bghover = "#000";
if (! $dropdown_bgcolour)
$dropdown_bgcolour = "#000";
if (! $dropdown_textcolour)
@@ -124,67 +110,3 @@
$dropdown_bordercol = "#000";
if (! $preview_backgroundimg)
$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
if (! $notify_bgcolour)
$notify_bgcolour = "#000";
if (! $notify_linkcolour)
$notify_linkcolour = "#fff";
if (! $notify_bghover)
$notify_bghover = "#000";
if (! $notify_topmargin)
$notify_topmargin = "-1px";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#000";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#000";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#000";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#fff";
if (! $input_bgsubmit)
$input_bgsubmit = "#000";
if (! $input_linksubmit)
$input_linksubmit = "#fff";
if (! $input_border)
$input_border = "#fff";
if (! $input_colourhover)
$input_colourhover = "#fff";
if (! $input_decohover)
$input_decohover = "underline";
if (! $acl_bgcolour)
$acl_bgcolour = "#000";
if (! $acl_bordercolour)
$acl_bordercolour = "#000";
if (! $aclbutton_linkcolour)
$aclbutton_linkcolour = "color: #fff;";
if (! $abookself_bgcolour)
$abookself_bgcolour = "#000";
if(! $infomess_bgcolour)
$infomess_bgcolour = "#000";
if(! $alert_txtcolour)
$alert_txtcolour = "#fff";
if(! $alert_bgcolour)
$alert_bgcolour = "#000";
if(! $alert_bordercol)
$alert_bordercol = "#fff";
if(! $alert_gradientcol)
$alert_gradientcol = "#000";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#000";
if(! $advperm_bordercol)
$advperm_bordercol = "#fff";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#000";
if(! $cal_bgcolour)
$cal_bgcolour = "#000";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#000";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#000";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#000";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="#000";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#000";
if (!$abook_changebg)
$abook_changebg="#000";

View File

@@ -1,50 +1,45 @@
{{include file="field_select.tpl" field=$schema}}
<div class="settings-submit-wrapper">
<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
</div>
{{if $expert}}
{{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{include file="field_colorinput.tpl" field=$nav_bg}}
{{include file="field_colorinput.tpl" field=$nav_gradient_top}}
{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
{{include file="field_colorinput.tpl" field=$nav_bd}}
{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
{{include file="field_colorinput.tpl" field=$banner_colour}}
{{include file="field_colorinput.tpl" field=$link_colour}}
{{include file="field_colorinput.tpl" field=$bgcolour}}
{{include file="field_colorinput.tpl" field=$background_image}}
{{include file="field_colorinput.tpl" field=$item_colour}}
{{include file="field_colorinput.tpl" field=$comment_item_colour}}
{{include file="field_colorinput.tpl" field=$comment_border_colour}}
{{include file="field_input.tpl" field=$comment_indent}}
{{include file="field_colorinput.tpl" field=$toolicon_colour}}
{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
{{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_colorinput.tpl" field=$font_colour}}
{{include file="field_input.tpl" field=$radius}}
{{include file="field_input.tpl" field=$shadow}}
{{include file="field_colorinput.tpl" field=$nav_bg}}
{{include file="field_colorinput.tpl" field=$nav_gradient_top}}
{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
{{include file="field_colorinput.tpl" field=$nav_bd}}
{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
{{include file="field_input.tpl" field=$nav_min_opacity}}
{{include file="field_colorinput.tpl" field=$bgcolour}}
{{include file="field_colorinput.tpl" field=$background_image}}
{{include file="field_colorinput.tpl" field=$item_colour}}
{{include file="field_colorinput.tpl" field=$comment_item_colour}}
{{include file="field_colorinput.tpl" field=$comment_border_colour}}
{{include file="field_input.tpl" field=$comment_indent}}
{{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_colorinput.tpl" field=$font_colour}}
{{include file="field_colorinput.tpl" field=$link_colour}}
{{include file="field_colorinput.tpl" field=$banner_colour}}
{{include file="field_colorinput.tpl" field=$toolicon_colour}}
{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
{{include file="field_input.tpl" field=$radius}}
{{include file="field_input.tpl" field=$shadow}}
{{include file="field_input.tpl" field=$top_photo}}
{{include file="field_input.tpl" field=$reply_photo}}
{{/if}}
{{include file="field_input.tpl" field=$converse_width}}
{{include file="field_checkbox.tpl" field=$converse_center}}
{{include file="field_input.tpl" field=$nav_min_opacity}}
{{include file="field_input.tpl" field=$top_photo}}
{{include file="field_input.tpl" field=$reply_photo}}
{{*include file="field_checkbox.tpl" field=$sloppy_photos*}}
{{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{if $expert}}
<script>
$(function(){
$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker();
$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'});
$('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
$('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
$('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
});
</script>
<div class="settings-submit-wrapper">
<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
</div>
{{/if}}
<div class="settings-submit-wrapper" >
<button type="submit" name="redbasic-settings-submit" class="btn btn-primary">{{$submit}}</button>
</div>

View File

@@ -16,6 +16,7 @@
<li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
<li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li>
<li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li>
<li><a href='{{$admin.queue.0}}'>{{$admin.queue.1}}</a></li>
<li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
<li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
<li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>

View File

@@ -34,8 +34,8 @@
<td class='channel_address'>{{$c.channel_address}}</td>
<td class="checkbox"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
<td class="tools">
<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='icon-remove admin-icons'></i></a>
<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='icon-trash admin-icons'></i></a>
</td>
</tr>
{{/foreach}}

14
view/tpl/admin_queue.tpl Normal file
View File

@@ -0,0 +1,14 @@
<h3>{{$banner}}</h3>
{{if $hasentries}}
<table cellpadding="10" id="admin-queue-table"><tr><td>{{$numentries}}&nbsp;&nbsp;</td><td>{{$desturl}}</td><td>{{$priority}}</td><td>&nbsp;</td><td>&nbsp;</td></tr>
{{foreach $entries as $e}}
<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td>{{$e.priority}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-default"><i class="icon-remove"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-default"><i class="icon-trash"></i></a></td>{{/if}}</tr>
{{/foreach}}
</table>
{{/if}}

View File

@@ -24,7 +24,7 @@
$.post(url, data, function(data) {
if(timer) clearTimeout(timer);
NavUpdate();
$.fancybox.close();
$.colorbox.close();
})
return false;
@@ -80,6 +80,7 @@
{{include file="field_input.tpl" field=$poll_interval}}
{{include file="field_input.tpl" field=$maxloadavg}}
{{include file="field_input.tpl" field=$abandon_days}}
{{include file="field_input.tpl" field=$default_expire_days}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

View File

@@ -1,36 +1,32 @@
<div class="generic-content-wrapper-styled" id='adminpage'>
<h1>{{$title}} - {{$page}}</h1>
{{if $adminalertmsg}}
<p class="alert alert-warning" role="alert">{{$adminalertmsg}}</p>
{{/if}}
<dl>
<dt>{{$queues.label}}</dt>
<dd>{{$queues.queue}}</dd>
</dl>
<dl>
<dt>{{$accounts.0}}</dt>
<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
</dl>
<dl>
<dt>{{$pending.0}}</dt>
<dd>{{$pending.1}}</dt>
</dl>
<dl>
<dt>{{$users.0}}</dt>
<dd>{{$users.1}}</dd>
<dt>{{$channels.0}}</dt>
<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
</dl>
<!-- $accounts is empty
{{foreach $accounts as $p}}
<dl>
<dt>{{$p.0}}</dt>
<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
</dl>
{{/foreach}} -->
<dl>
<dt>{{$plugins.0}}</dt>
<dd>
{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
&nbsp;
</dd>
</dl>
<dl>
<dt>{{$version.0}}</dt>
<dd>{{$version.1}} - {{$build}}</dd>
</dl>
</div>
</div>

View File

@@ -10,15 +10,15 @@
return false;
}
</script>
<div class = "generic-content-wrapper-styled" id='adminpage'>
<div class="generic-content-wrapper-styled" id="adminpage">
<h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/users" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<h3>{{$h_pending}}</h3>
{{if $pending}}
<table id='pending'>
<table id="pending">
<thead>
<tr>
{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
@@ -31,27 +31,25 @@
<tr>
<td class="created">{{$u.account_created}}</td>
<td class="email">{{$u.account_email}}</td>
<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td>
<td class="tools">
<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a>
<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><i class='icon-thumbs-down-alt admin-icons'></i></a>
<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="icon-thumbs-up-alt admin-icons"></i></a>
<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="icon-thumbs-down-alt admin-icons"></i></a>
</td>
</tr>
{{/foreach}}
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>
<div class="selectall"><a href="#" onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div>
{{else}}
<p>{{$no_pending}}</p>
{{/if}}
<h3>{{$h_users}}</h3>
{{if $users}}
<table id='users'>
<table id="users">
<thead>
<tr>
{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
@@ -62,30 +60,29 @@
<tbody>
{{foreach $users as $u}}
<tr>
<td class='account_id'>{{$u.account_id}}</td>
<td class='email'>{{if $u.blocked}}
<td class="account_id">{{$u.account_id}}</td>
<td class="email">{{if $u.blocked}}
<i>{{$u.account_email}}</i>
{{else}}
<strong>{{$u.account_email}}</strong>
{{/if}}</td>
<td class='channels'>{{$u.channels}}</td>
<td class='register_date'>{{$u.account_created}}</td>
<td class='login_date'>{{$u.account_lastlog}}</td>
<td class='account_expires'>{{$u.account_expires}}</td>
<td class='service_class'>{{$u.account_service_class}}</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"/></td>
<td class="channels">{{$u.channels}}</td>
<td class="register_date">{{$u.account_created}}</td>
<td class="login_date">{{$u.account_lastlog}}</td>
<td class="account_expires">{{$u.account_expires}}</td>
<td class="service_class">{{$u.account_service_class}}</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td>
<td class="tools">
<a href="{{$baseurl}}/admin/users/block/{{$u.account_id}}?t={{$form_security_token}}" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($u.blocked)}}dim{{/if}}'></i></a>
<a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a>
<a href="{{$baseurl}}/admin/users/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="icon-ban-circle admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="icon-trash admin-icons"></i></a>
</td>
</tr>
{{/foreach}}
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>
<div class="selectall"><a href="#" onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div>
{{else}}
NO USERS?!?
{{/if}}
</form>
</div>
</div>

View File

@@ -11,7 +11,7 @@
<input type="hidden" name="papp" value="{{$app.papp}}" />
{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}}
{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="icon-pencil" ></i></button>{{/if}}
{{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></button>{{/if}}
{{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></button>{{/if}}
</form>
{{/if}}
{{/if}}

View File

@@ -3,42 +3,26 @@
<input type="hidden" name="filehash" value="{{$file.hash}}" />
<input type="hidden" name="uid" value="{{$uid}}" />
<input type="hidden" name="fileid" value="{{$file.id}}" />
{{if !$isadir}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}}
{{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}}
<div id="attach-edit-tools-share" class="btn-group form-group">
{{if !$isadir}}
<a href="/rpost?body=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}">
<i class="icon-paperclip jot-icons"></i>
<a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-default btn-xs" title="{{$attach_btn_title}}">
<i class="icon-share jot-icons"></i>
</a>
{{/if}}
<button id="link-btn" class="btn btn-default btn-xs" type="button" onclick="openClose('link-code');" title="{{$link_btn_title}}">
<i class="icon-share jot-icons"></i>
<i class="icon-link jot-icons"></i>
</button>
</div>
<div id="attach-edit-tools-perms" class="form-group pull-right btn-group">
{{if $isadir}}
<div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons">
<label class="btn btn-default btn-xs" title="{{$recurse}}">
<input type="checkbox" autocomplete="off" name="recurse" value="1"><i class="icon-level-down jot-icons"></i>
</label>
</div>
{{/if}}
{{if !$isadir}}
<div id="attach-edit-activity" class="btn-group" data-toggle="buttons">
<label class="btn btn-default btn-xs" title="{{$activity_btn_title}}">
<input type="checkbox" autocomplete="off" name="no_activity" value="1"><i class="icon-ban-circle jot-icons"></i>
</label>
</div>
{{/if}}
<div id="attach-edit-perms" class="btn-group">
<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
</button>
<button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
{{$submit}}
</button>
</div>
<div id="attach-edit-perms" class="btn-group pull-right">
<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
</button>
<button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
{{$submit}}
</button>
</div>
{{$aclselect}}
<div id="link-code" class="form-group">

View File

@@ -1,18 +1,63 @@
{{if $pages}}
<div id="pagelist-content-wrapper" class="generic-content-wrapper">
{{foreach $pages as $key => $items}}
{{foreach $items as $item}}
<div class="page-list-item">
{{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}}
{{if $view}}<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}}
{{*if $preview}}<a href="block/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon btn-btn-default"></i></a> {{/if*}}
{{$item.title}}
</div>
{{/foreach}}
{{/foreach}}
</div>
<div class="clear"></div>
<div class="section-title-wrapper">
{{if $editor}}
<div class="pull-right">
<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('block-editor');"><i class="icon-edit"></i>&nbsp;{{$create}}</button>
</div>
{{/if}}
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>
{{if $editor}}
<div id="block-editor" class="section-content-tools-wrapper">
{{$editor}}
</div>
{{/if}}
{{if $pages}}
<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
<table id="block-list-table">
<tr>
<th width="97%">{{$name}}</th>
<th width="1%"></th>
<th width="1%"></th>
<th width="1%"></th>
<th width="1%" class="hidden-xs">{{$created}}</th>
<th width="1%" class="hidden-xs">{{$edited}}</th>
</tr>
{{foreach $pages as $key => $items}}
{{foreach $items as $item}}
<tr id="block-list-item-{{$item.url}}">
<td>
{{if $view}}
<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
{{else}}
{{$item.title}}
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $edit}}
<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $item.bb_element}}
<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
{{/if}}
</td>
<td class="webpage-list-tool">
{{if $edit}}
<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#block-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
{{/if}}
</td>
<td class="hidden-xs">
{{$item.created}}
</td>
<td class="hidden-xs">
{{$item.edited}}
</td>
</tr>
{{/foreach}}
{{/foreach}}
</table>
</div>
<div class="clear"></div>
{{/if}}

View File

@@ -23,4 +23,16 @@
<div class="channels-end all"></div>
{{if $delegates}}
<hr />
<h3>{{$delegate_header}}</h3>
<div id="delegated-channels">
{{foreach $delegates as $chn}}
{{include file="channel.tpl" channel=$chn}}
{{/foreach}}
</div>
<div class="channels-end all"></div>
{{/if}}
</div>

View File

@@ -26,7 +26,7 @@
<td class="cloud-index-tool">{{$item.attachIcon}}</td>
<td id="file-edit-{{$item.attachId}}" class="cloud-index-tool"></td>
<td class="cloud-index-tool"><i class="fakelink icon-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td>
<td class="cloud-index-tool"><a href="{{$item.fileStorageUrl}}/{{$item.attachId}}/delete" title="{{$delete}}" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a></td>
<td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="icon-trash drop-icons"></i></a></td>
{{else}}
<td></td><td></td><td></td><td></td>
@@ -35,7 +35,7 @@
<td class="hidden-xs">{{$item.sizeFormatted}}</td>
<td class="hidden-xs">{{$item.lastmodified}}</td>
</tr>
<tr>
<tr id="cloud-tools-{{$item.attachId}}">
<td id="perms-panel-{{$item.attachId}}" colspan="9"></td>
</tr>
{{/foreach}}

View File

@@ -40,15 +40,15 @@
</button>
</div>
<div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;">
<!--button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', {{$id}}); return false;">
<i class="icon-camera comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', {{$id}}); return false;">
</button-->
<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertCommentURL('{{$comment}}',{{$id}}); return false;">
<i class="icon-link comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
<!--button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
<i class="icon-facetime-video comment-icon"></i>
</button>
</button-->
</div>
{{if $feature_encrypt}}
<div class='btn-group'>
@@ -60,7 +60,7 @@
</div>
<div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}">
{{if $preview}}
<button id="comment-edit-submit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
<button id="comment-edit-presubmit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}">
<i class="icon-eye-open comment-icon" ></i>
</button>
{{/if}}

View File

@@ -1,4 +1,4 @@
<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
<script>
$("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], width:'100%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
$("#contact-range").jRange({ from: {{$min|default:'0'}}, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false, onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } });
</script>

View File

@@ -1,3 +1,3 @@
{{foreach $contacts as $contact}}
{{include file="connection_template.tpl"}}
{{include file="connection_template.tpl"}}
{{/foreach}}

View File

@@ -21,14 +21,14 @@
{{/if}}
{{if $item.lock}}
<div class="wall-item-lock dropdown">
<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
</div>
{{/if}}
<div class="wall-item-author">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
</div>
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-remove item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
</div>
<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
<div class="wall-item-title-end"></div>
@@ -56,15 +56,39 @@
<div class="wall-item-tools">
<div class="wall-item-tools-right btn-group pull-right">
{{if $item.like}}
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false">
<i class="icon-thumbs-up-alt" title="{{$item.like.0}}"></i>
<button type="button" title="{{$item.like.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'like'); return false;">
<i class="icon-thumbs-up-alt" ></i>
</button>
{{/if}}
{{if $item.dislike}}
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false">
<i class="icon-thumbs-down-alt" title="{{$item.dislike.0}}"></i>
<button type="button" title="{{$item.dislike.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'dislike'); return false;">
<i class="icon-thumbs-down-alt" ></i>
</button>
{{/if}}
{{if $item.isevent}}
<button type="button" title="{{$item.attend.0}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
<i class="icon-ok" ></i>
</button>
<button type="button" title="{{$item.attend.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'attendno'); return false;">
<i class="icon-remove" ></i>
</button>
<button type="button" title="{{$item.attend.2}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
<i class="icon-question" ></i>
</button>
{{/if}}
{{if $item.canvote}}
<button type="button" title="{{$item.conlabels.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'agree'); return false;">
<i class="icon-ok" ></i>
</button>
<button type="button" title="{{$item.conlabels.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'disagree'); return false;">
<i class="icon-remove" ></i>
</button>
<button type="button" title="{{$item.conlabels.2}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'abstain'); return false;">
<i class="icon-question" ></i>
</button>
{{/if}}
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
<i class="icon-caret-down"></i>
</button>
@@ -93,81 +117,52 @@
{{if $item.star}}
<li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
{{/if}}
{{if $item.drop.dropping}}
<li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
{{/if}}
{{if $item.item_photo_menu}}
<li role="presentation" class="divider"></li>
{{$item.item_photo_menu}}
{{/if}}
{{if $item.drop.dropping}}
<li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li>
{{/if}}
</ul>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
<div class="wall-item-tools-left{{if $item.like_count && $item.dislike_count}} btn-group{{/if}}">
{{if $item.like_count}}
{{if $item.responses }}
<div class="wall-item-tools-left{{if $item.responses.count > 1}} btn-group{{/if}}">
{{foreach $item.responses as $verb=>$response}}
{{if $response.count}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$item.id}}">{{$item.like_count}} {{$item.like_button_label}}</button>
{{if $item.like_list_part}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
{{if $response.list_part}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{else}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{/if}}
</div>
{{/if}}
{{if $item.dislike_count}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_count}} {{$item.dislike_button_label}}</button>
{{if $item.dislike_list_part}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
{{else}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{/if}}
{{if $response.list_part}}
<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{$response.title}}</h4>
</div>
<div class="modal-body">
<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{{/if}}
</div>
{{/if}}
{{/foreach}}
</div>
{{if $item.like_list_part}}
<div class="modal" id="likeModal-{{$item.id}}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{$item.like_modal_title}}</h4>
</div>
<div class="modal-body">
<ul>{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{{/if}}
{{if $item.dislike_list_part}}
<div class="modal" id="dislikeModal-{{$item.id}}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{$item.dislike_modal_title}}</h4>
</div>
<div class="modal-body">
<ul>{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{{/if}}
</div>
{{* we dont' use this do we?
{{if $item.drop.pagedrop}}
<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />
{{/if}}
*}}
<div class="clear"></div>
</div>
<div class="wall-item-wrapper-end"></div>

View File

@@ -21,14 +21,14 @@
{{/if}}
{{if $item.lock}}
<div class="wall-item-lock dropdown">
<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
</div>
{{/if}}
<div class="wall-item-author">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
</div>
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-remove item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
</div>
<div class="wall-item-content conv-list-mode" id="wall-item-content-{{$item.id}}">
<div class="wall-item-title-end"></div>
@@ -65,6 +65,31 @@
<i class="icon-thumbs-down-alt" title="{{$item.dislike.0}}"></i>
</button>
{{/if}}
{{if $item.isevent}}
<button type="button" title="{{$item.attend.0}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;">
<i class="icon-ok" ></i>
</button>
<button type="button" title="{{$item.attend.1}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendno'); return false;">
<i class="icon-remove" ></i>
</button>
<button type="button" title="{{$item.attend.2}}" class="btn btn-default btn-sm" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendmaybe'); return false;">
<i class="icon-question" ></i>
</button>
{{/if}}
{{if $item.canvote}}
<button type="button" title="{{$item.conlabels.0}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'agree'); return false;">
<i class="icon-ok" ></i>
</button>
<button type="button" title="{{$item.conlabels.1}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'disagree'); return false;">
<i class="icon-remove" ></i>
</button>
<button type="button" title="{{$item.conlabels.2}}" class="btn btn-default btn-sm" onclick="dolike({{$item.id}},'abstain'); return false;">
<i class="icon-question" ></i>
</button>
{{/if}}
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
<i class="icon-caret-down"></i>
</button>
@@ -93,80 +118,64 @@
{{if $item.star}}
<li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
{{/if}}
{{if $item.drop.dropping}}
<li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
{{/if}}
{{if $item.item_photo_menu}}
<li role="presentation" class="divider"></li>
{{$item.item_photo_menu}}
{{/if}}
{{if $item.drop.dropping}}
<li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li>
{{/if}}
</ul>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
<div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}">
<div class="wall-item-list-comments btn-group">
<button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;">
{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
</button>
</div>
{{if $item.unseen_comments}}
<div class="unseen-wall-indicator-{{$item.id}} btn-group">
<button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;">
<i class="icon-check"></i>
</button>
</div>
{{/if}}
<div class="wall-item-list-comments btn-group"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;">{{$item.comment_count_txt}}{{if $item.unseen_comments}}
<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}{{/if}}</span></button></div>{{if $item.unseen_comments}}<div class="unseen-wall-indicator-{{$item.id}} btn-group"><button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"><i class="icon-check"></i></div>{{/if}}
{{if $item.like_count}}
{{if $item.responses }}
{{foreach $item.responses as $verb=>$response}}
{{if $response.count}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$item.id}}">{{$item.like_count}} {{$item.like_button_label}}</button>
{{if $item.like_list_part}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
{{if $response.list_part}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{else}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$item.id}}">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
{{/if}}
{{if $response.list_part}}
<div class="modal" id="{{$verb}}Modal-{{$item.id}}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{$response.title}}</h4>
</div>
<div class="modal-body">
<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{{/if}}
</div>
{{/if}}
{{if $item.dislike_count}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$item.id}}">{{$item.dislike_count}} {{$item.dislike_button_label}}</button>
{{if $item.dislike_list_part}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
{{else}}
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$item.id}}">{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
{{/if}}
</div>
{{/foreach}}
{{/if}}
</div>
{{if $item.like_list_part}}
<div class="modal" id="likeModal-{{$item.id}}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{$item.like_modal_title}}</h4>
</div>
<div class="modal-body">
<ul>{{foreach $item.like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{{/if}}
{{if $item.dislike_list_part}}
<div class="modal" id="dislikeModal-{{$item.id}}">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{$item.dislike_modal_title}}</h4>
</div>
<div class="modal-body">
<ul>{{foreach $item.dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
</div>
<div class="modal-footer clear">
<button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{{/if}}
</div>
<div class="clear"></div>
</div>

View File

@@ -1,6 +1,6 @@
<div id="design-tools" class="widget design-tools">
<h3>{{$title}}</h3>
<ul>
<ul class="nav nav-pills nav-stacked">
<li><a href="blocks/{{$who}}">{{$blocks}}</a></li>
<li><a href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a></li>
<li><a href="layouts/{{$who}}">{{$layout}}</a></li>

View File

@@ -1,10 +1,15 @@
<div class="widget" id="dir_sort_links">
<h3>{{$header}}</h3>
{{include file="field_checkbox.tpl" field=$safemode}}
{{include file="field_checkbox.tpl" field=$globaldir}}
{{include file="field_checkbox.tpl" field=$pubforums}}
{{$sort}}: <select onchange='window.location.href="{{$sorturl}}&order="+this.value'>
<option value='normal' {{if $selected_sort == 'normal'}}selected='selected'{{/if}}>{{$normal}}</option>
<option value='reverse' {{if $selected_sort == 'reverse'}}selected='selected'{{/if}}>{{$reverse}}</option>
<option value='date' {{if $selected_sort == 'date'}}selected='selected'{{/if}}>{{$date}}</option>
<option value='reversedate' {{if $selected_sort == 'reversedate'}}selected='selected'{{/if}}>{{$reversedate}}</option>
</select><br />
<input type='checkbox' {{if $pubforumsonly}}checked='checked'{{/if}} onchange='window.location.href="{{$forumsurl}}&pubforums="+(this.checked ? 1 : 0)'/> {{$pubforums}}<br />
</div>

View File

@@ -20,6 +20,9 @@
{{if $entry.canrate}}<button class="btn btn-default" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i></button><span class="required" id="edited-{{$entry.hash}}" style="display: none;" >*</span>{{/if}}
</div>
{{/if}}
{{if $entry.common_friends}}
<div id="dir-common">{{$entry.common_txt}}</div>
{{/if}}
{{if $entry.public_forum}}
<div class="contact-forum">
{{$entry.forum_label}} @{{$entry.nickname}}+

View File

@@ -1 +1,12 @@
<h2>{{$title}}</h2>
<div class="section-title-wrapper">
{{if $delete}}
<div class="pull-right">
<a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
</div>
{{/if}}
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>
<div id="webpage-editor" class="section-content-tools-wrapper">
{{$editor}}
</div>

View File

@@ -8,6 +8,7 @@
<div class="event-buttons">
{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link"><i class="icon-external-link btn btn-default" ></i></a>{{/if}}
{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil btn btn-default"></i></a>{{/if}}
{{if $event.drop}}<a href="{{$event.drop.0}}" title="{{$event.drop.1}}" class="drop-event-link"><i class="icon-trash btn btn-default"></i></a>{{/if}}
</div>
</div>
<div class="clear"></div>

Some files were not shown because too many files have changed in this diff Show More