Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
Fixed some stuff: - converted some files from DOS to Uni* (CRLF -> LF) - removed trailing white-spaces Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
commit
7a9456d5ac
350 changed files with 19367 additions and 16093 deletions
11107
view/lang/de/messages.po
11107
view/lang/de/messages.po
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,19 +1,19 @@
|
|||
<!DOCTYPE html >
|
||||
<html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
||||
<section>
|
||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html >
|
||||
<html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
||||
<section>
|
||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
<!DOCTYPE html >
|
||||
<html>
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
<!DOCTYPE html >
|
||||
<html>
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important;display:block!important;"><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
33
view/templates/admin_blocklist.tpl
Normal file
33
view/templates/admin_blocklist.tpl
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<script>
|
||||
function confirm_delete(uname){
|
||||
return confirm("{{$confirm_delete}}".format(uname));
|
||||
}
|
||||
</script>
|
||||
<div id="adminpage">
|
||||
<h1>{{$title}} - {{$page}}</h1>
|
||||
<p>{{$intro}}</p>
|
||||
<p>{{$public}}</p>
|
||||
|
||||
<h2>{{$addtitle}}</h2>
|
||||
<form action="{{$baseurl}}/admin/blocklist" method="post">
|
||||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||
{{include file="field_input.tpl" field=$newdomain}}
|
||||
{{include file="field_input.tpl" field=$newreason}}
|
||||
<div class="submit"><input type="submit" name="page_blocklist_save" value="{{$submit}}" /></div>
|
||||
</form>
|
||||
|
||||
{{if $entries}}
|
||||
<h2>{{$currenttitle}}</h2>
|
||||
<p>{{$currentintro}}</p>
|
||||
<form action="{{$baseurl}}/admin/blocklist" method="post">
|
||||
<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
|
||||
{{foreach $entries as $e}}
|
||||
{{include file="field_input.tpl" field=$e.domain}}
|
||||
{{include file="field_input.tpl" field=$e.reason}}
|
||||
{{include file="field_checkbox.tpl" field=$e.delete}}
|
||||
{{/foreach}}
|
||||
<div class="submit"><input type="submit" name="page_blocklist_edit" value="{{$savechanges}}" /></div>
|
||||
{{/if}}
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
|
@ -118,7 +118,6 @@
|
|||
{{include file="field_input.tpl" field=$proxy}}
|
||||
{{include file="field_input.tpl" field=$proxyuser}}
|
||||
{{include file="field_input.tpl" field=$timeout}}
|
||||
{{include file="field_input.tpl" field=$maxloadavg}}
|
||||
{{include file="field_input.tpl" field=$maxloadavg_frontend}}
|
||||
{{include file="field_input.tpl" field=$optimize_max_tablesize}}
|
||||
{{include file="field_input.tpl" field=$optimize_fragmentation}}
|
||||
|
|
@ -146,6 +145,8 @@
|
|||
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
|
||||
|
||||
<h3>{{$worker_title}}</h3>
|
||||
{{include file="field_input.tpl" field=$maxloadavg}}
|
||||
{{include file="field_input.tpl" field=$min_memory}}
|
||||
{{include file="field_input.tpl" field=$worker_queues}}
|
||||
{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
|
||||
{{include file="field_checkbox.tpl" field=$worker_fastlane}}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
|
||||
<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
|
||||
<a href="group/drop/{{$id}}?t={{$form_security_token}}"
|
||||
onclick="return confirmDelete();"
|
||||
id="group-delete-icon-{{$id}}"
|
||||
class="icon drophide group-delete-icon"
|
||||
onmouseover="imgbright(this);"
|
||||
onmouseout="imgdull(this);" ></a>
|
||||
<a href="group/drop/{{$id}}?t={{$form_security_token}}"
|
||||
onclick="return confirmDelete();"
|
||||
id="group-delete-icon-{{$id}}"
|
||||
class="icon drophide group-delete-icon"
|
||||
onmouseover="imgbright(this);"
|
||||
onmouseout="imgdull(this);"
|
||||
title="{{$delete}}">
|
||||
</a>
|
||||
</div>
|
||||
<div class="group-delete-end"></div>
|
||||
|
|
|
|||
|
|
@ -1,21 +1,61 @@
|
|||
|
||||
{{* Template for the contact group list *}}
|
||||
|
||||
{{* The contacts who are already members of the contact group *}}
|
||||
<div id="group">
|
||||
<h3>{{$groupeditor.label_members}}</h3>
|
||||
<div id="group-members" class="contact_list">
|
||||
{{if $groupeditor.members }}
|
||||
{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
|
||||
{{else}}
|
||||
{{$groupeditor.group_is_empty}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<div id="group-members-end"></div>
|
||||
<hr id="group-separator" />
|
||||
<h3>{{$groupeditor.label_members}}</h3>
|
||||
<div id="group-members" class="contact_list">
|
||||
|
||||
{{if $groupeditor.members }}
|
||||
|
||||
{{foreach $groupeditor.members as $c}}
|
||||
{{* If there are too many contacts we use another view mode *}}
|
||||
{{if $shortmode}}
|
||||
<div class="contact-block-textdiv mpgroup">
|
||||
<a class="contact-block-link mpgroup fakelink" target="redir" onclick="groupChangeMember({{$c.change_member.gid}},{{$c.change_member.cid}},'{{$c.change_member.sec_token}}'); return true;" title="{{$c.name}} [{{$c.itemurl}}]" alt="{{$c.name}}">
|
||||
{{$c.name}}"
|
||||
</a>
|
||||
</div>
|
||||
{{else}}
|
||||
{{* The normal view mode *}}
|
||||
<div class="contact-block-div mpgroup">
|
||||
<a class="contact-block-link mpgroup fakelink" target="redir" onclick="groupChangeMember({{$c.change_member.gid}},{{$c.change_member.cid}},'{{$c.change_member.sec_token}}'); return true;">
|
||||
<img class="contact-block-img mpgroup " src="{{$c.thumb}}" title="{{$c.name}} [{{$c.itemurl}}]" alt="{{$c.name}}">
|
||||
</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
|
||||
{{else}}
|
||||
{{$groupeditor.group_is_empty}}
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
<div id="group-members-end"></div>
|
||||
<hr id="group-separator" />
|
||||
</div>
|
||||
|
||||
{{* The contacts who are not members of the contact group *}}
|
||||
<div id="contacts">
|
||||
<h3>{{$groupeditor.label_contacts}}</h3>
|
||||
<div id="group-all-contacts" class="contact_list">
|
||||
{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
|
||||
</div>
|
||||
<div id="group-all-contacts-end"></div>
|
||||
<h3>{{$groupeditor.label_contacts}}</h3>
|
||||
<div id="group-all-contacts" class="contact_list">
|
||||
{{foreach $groupeditor.contacts as $m}}
|
||||
{{* If there are too many contacts we use another view mode *}}
|
||||
{{if $shortmode}}
|
||||
<div class="contact-block-textdiv mpall">
|
||||
<a class="contact-block-link mpall fakelink" target="redir" onclick="groupChangeMember({{$m.change_member.gid}},{{$m.change_member.cid}},'{{$m.change_member.sec_token}}'); return true;" title="{{$m.name}} [{{$m.itemurl}}]" alt="{{$m.name}}">
|
||||
{{$m.name}}
|
||||
</a>
|
||||
</div>
|
||||
{{else}}
|
||||
{{* The normal view mode *}}
|
||||
<div class="contact-block-div mpall">
|
||||
<a class="contact-block-link mpall fakelink" target="redir" onclick="groupChangeMember({{$m.change_member.gid}},{{$m.change_member.cid}},'{{$m.change_member.sec_token}}'); return true;">
|
||||
<img class="contact-block-img mpall " src="{{$m.thumb}}" title="{{$m.name}} [{{$m.itemurl}}]" alt="{{$m.name}}">
|
||||
</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
<div id="group-all-contacts-end"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
|
||||
<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
|
||||
<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}" />
|
||||
<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />
|
||||
{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />{{/if}}
|
||||
</form>
|
||||
<div class="intro-form-end"></div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Theme settings
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
function theme_content(App $a) {
|
||||
if (!local_user()) {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ $uid = get_theme_uid();
|
|||
|
||||
$s_colorset = get_config('duepuntozero','colorset');
|
||||
$colorset = get_pconfig( $uid, 'duepuntozero', 'colorset');
|
||||
if (!x($colorset))
|
||||
if (!x($colorset))
|
||||
$colorset = $s_colorset;
|
||||
|
||||
if ($colorset) {
|
||||
|
|
@ -25,5 +25,3 @@ if ($colorset) {
|
|||
}
|
||||
|
||||
echo $setcss;
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
function duepuntozero_init(App $a) {
|
||||
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
<?php
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
require_once('view/theme/frio/php/Image.php');
|
||||
|
||||
function theme_content(App $a) {
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ blockquote {
|
|||
code {
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
.help-content-wrapper code {display: inline}
|
||||
.help-content-wrapper code, .help-aside-wrapper code {display: inline}
|
||||
|
||||
/*
|
||||
* standard page elements
|
||||
|
|
@ -164,6 +164,9 @@ code {
|
|||
padding: 8px 16px;
|
||||
color: inherit;
|
||||
}
|
||||
a.btn:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.btn-default {
|
||||
background: #ededed;
|
||||
|
|
@ -211,6 +214,12 @@ code {
|
|||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
}
|
||||
.btn-clear,
|
||||
.btn-clear:active {
|
||||
border: 0;
|
||||
background: transparent;
|
||||
box-shadow: none;
|
||||
}
|
||||
.btn-eventnav, btn-eventnav:hover {
|
||||
font-size: 16px;
|
||||
background: none;
|
||||
|
|
@ -1394,6 +1403,12 @@ section #jotOpen {
|
|||
border-radius: 4px;
|
||||
position: relative;
|
||||
}
|
||||
.panel.panel-inline {
|
||||
margin-left: -15px;
|
||||
margin-right: -15px;
|
||||
margin-top: 15px;
|
||||
padding: 15px;
|
||||
}
|
||||
.panel .panel-body {
|
||||
padding: 15px;
|
||||
font-size: 14px;
|
||||
|
|
@ -1927,7 +1942,8 @@ ul.dropdown-menu li:hover {
|
|||
font-size: 12px;
|
||||
}
|
||||
.media-list > li:hover,
|
||||
.media-list > li.selected {
|
||||
.media-list > li.selected,
|
||||
.media-list > li.active {
|
||||
border-left: 3px solid $link_color;
|
||||
background-color: rgba(247, 247, 247, $contentbg_transp);
|
||||
}
|
||||
|
|
@ -2015,9 +2031,9 @@ ul.dropdown-menu li:hover {
|
|||
.allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
|
||||
.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
|
||||
.message-content-wrapper, .apps-content-wrapper, .photos-content-wrapper,
|
||||
.admin-content-wrapper, .group-content-wrapper, .viewcontacts-content-wrapper,
|
||||
.dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper,
|
||||
.nogroup-content-wrapper, .profperm-content-wrapper {
|
||||
.admin-content-wrapper, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
|
||||
.friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper,
|
||||
.profperm-content-wrapper {
|
||||
min-height: calc(100vh - 150px);
|
||||
padding: 15px;
|
||||
padding-bottom: 20px;
|
||||
|
|
@ -2064,6 +2080,9 @@ ul.viewcontact_wrapper > li {
|
|||
position: relative;*/
|
||||
/*border-left: 3px solid white;*/
|
||||
}
|
||||
.contact-wrapper .contact-photo-wrapper button {
|
||||
padding: 0;
|
||||
}
|
||||
.contact-wrapper.media {
|
||||
overflow: visible;
|
||||
word-wrap: break-word;
|
||||
|
|
@ -2094,6 +2113,9 @@ ul.viewcontact_wrapper > li {
|
|||
.contact-wrapper .contact-photo-overlay-content.xl {
|
||||
font-size: 48px;
|
||||
}
|
||||
.contact-wrapper .contact-photo-menu {
|
||||
top: auto;
|
||||
}
|
||||
|
||||
.contact-entry-desc {
|
||||
color: #555;
|
||||
|
|
@ -2167,6 +2189,61 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
|
|||
padding-top: 10px;
|
||||
}
|
||||
|
||||
/* group edit page */
|
||||
.group-actions {
|
||||
margin-top: 20px;
|
||||
margin-bottom: 10px;
|
||||
font-size: 30px;
|
||||
}
|
||||
.group-actions button,
|
||||
.group-actions a {
|
||||
font-size: 18px;
|
||||
}
|
||||
#group-edit-wrapper {
|
||||
display: none;
|
||||
}
|
||||
#group-update-wrapper .contact-photo-overlay {
|
||||
display: none;
|
||||
}
|
||||
#group-update-wrapper .viewcontact_wrapper .contact-group-actions {
|
||||
height: 100%;
|
||||
margin-top: -10px;
|
||||
display: flex;
|
||||
}
|
||||
#group-update-wrapper .viewcontact_wrapper .contact-action-link {
|
||||
opacity: 0.8;
|
||||
font-size: 20px;
|
||||
line-height: 50px;
|
||||
}
|
||||
#group-update-wrapper .viewcontact_wrapper .contact-action-link:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
#group-update-wrapper .shortmode {
|
||||
height: 53px;
|
||||
overflow: hidden;
|
||||
}
|
||||
#group-update-wrapper .shortmode .contact-photo {
|
||||
height: 32px;
|
||||
width: 32px;
|
||||
}
|
||||
#group-update-wrapper .shortmode .media {
|
||||
overflow: hidden;
|
||||
}
|
||||
#group-update-wrapper .shortmode .contact-entry-desc {
|
||||
font-size: 12px !important;
|
||||
}
|
||||
#group-update-wrapper .shortmode .contact-entry-desc h4.media-heading {
|
||||
margin: 0;
|
||||
}
|
||||
#group-update-wrapper .shortmode .contact-entry-desc h4.media-heading a {
|
||||
font-size: 13px !important;
|
||||
white-space: nowrap;
|
||||
}
|
||||
#group-update-wrapper .shortmode .contact-entry-desc .contact-entry-rel,
|
||||
#group-update-wrapper .shortmode .contact-entry-desc .contact-entry-network {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* private mail */
|
||||
.message-content-wrapper > li {
|
||||
/* we need this overwriting because we have no template file
|
||||
|
|
|
|||
88
view/theme/frio/js/mod_group.js
Normal file
88
view/theme/frio/js/mod_group.js
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
|
||||
/**
|
||||
* @file view/theme/frio/js/mod_group.js
|
||||
* @brief The javascript for the group module
|
||||
*/
|
||||
|
||||
|
||||
$(document).ready(function() {
|
||||
// Add an event listeners on buttons for switching the contact list view
|
||||
$("body").on("click", ".group-list-switcher", function() {
|
||||
switchGroupViewMode(this);
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* @brief Change the group membership of the contacts and fetch the new grup list
|
||||
* as html
|
||||
*
|
||||
* @param {int} gid The group ID
|
||||
* @param {int} cid The contact ID
|
||||
* @param {string} sec_token The security token
|
||||
*
|
||||
* @returns {undefined}
|
||||
*/
|
||||
function groupChangeMember(gid, cid, sec_token) {
|
||||
$("#contact-entry-wrapper-" + cid).fadeTo("fast", 0.33);
|
||||
$(".tooltip").tooltip("hide");
|
||||
$("body").css("cursor", "wait");
|
||||
|
||||
$.get('group/' + gid + '/' + cid + "?t=" + sec_token, function(data) {
|
||||
// Insert the new group member list
|
||||
$("#group-update-wrapper").html(data);
|
||||
|
||||
// Apply the actual gropu list view mode to the new
|
||||
// group list html
|
||||
var activeMode = $(".group-list-switcher.active");
|
||||
switchGroupViewMode(activeMode[0]);
|
||||
|
||||
$("body").css("cursor", "auto");
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Change the group list view mode
|
||||
*
|
||||
* @param {object} elm The button element of the view mode switcher
|
||||
* @returns {undefined}
|
||||
*/
|
||||
function switchGroupViewMode(elm) {
|
||||
// Remove the active class from group list switcher buttons
|
||||
$(".group-list-switcher").removeClass("active");
|
||||
// And add it to the active button element
|
||||
$(elm).addClass("active");
|
||||
|
||||
// Add or remove the css classes for the group list with regard to the active view mode
|
||||
if (elm.id === "group-list-small") {
|
||||
$("#contact-group-list > li").addClass("shortmode col-lg-6 col-md-6 col-sm-6 col-xs-12");
|
||||
} else {
|
||||
$("#contact-group-list > li").removeClass("shortmode col-lg-6 col-md-6 col-sm-6 col-xs-12");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Filter the group member list for contacts
|
||||
*
|
||||
* @returns {undefined}
|
||||
*/
|
||||
function filterList() {
|
||||
// Declare variables
|
||||
var input, filter, ul, li, a, i;
|
||||
input = document.getElementById("contacts-search");
|
||||
filter = input.value.toUpperCase();
|
||||
li = document.querySelectorAll("#contact-group-list>li");
|
||||
|
||||
// Loop through all list items, and hide those who don't match the search query
|
||||
for (i = 0; i < li.length; i++) {
|
||||
// Get the heading element
|
||||
var mh = li[i].getElementsByClassName("media-heading")[0];
|
||||
// The first child of the heading element should contain
|
||||
// the text which we want to filter
|
||||
a = mh.firstChild;
|
||||
if (a.innerHTML.toUpperCase().indexOf(filter) > -1) {
|
||||
li[i].style.display = "";
|
||||
} else {
|
||||
li[i].style.display = "none";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -15,14 +15,14 @@
|
|||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
|
||||
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
|
||||
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
|
||||
<script>var frio="<?php echo "view/theme/frio"; ?>";</script>
|
||||
<?php $baseurl = App::get_baseurl(); ?>
|
||||
<?php $baseurl = Friendica\App::get_baseurl(); ?>
|
||||
<?php $frio = "view/theme/frio"; ?>
|
||||
<?php
|
||||
<?php
|
||||
// Because we use minimal for modals the header and the included js stuff should be only loaded
|
||||
// if the page is an standard page (so we don't have it twice for modals)
|
||||
//
|
||||
//
|
||||
/// @todo Think about to move js stuff in the footer
|
||||
if(!$minimal) {
|
||||
if(x($page,'htmlhead')) echo $page['htmlhead'];
|
||||
|
|
|
|||
|
|
@ -3,10 +3,11 @@
|
|||
/**
|
||||
* @file view/theme/frio/php/frio_boot.php
|
||||
*
|
||||
* @brief This file contains functions for page contstruction
|
||||
* @brief This file contains functions for page construction
|
||||
*
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
/**
|
||||
* @brief Load page template in dependence of the template mode
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<meta name="viewport" content="initial-scale=1.0">
|
||||
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
|
||||
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
|
||||
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
|
||||
<script>var frio="<?php echo "view/theme/frio"; ?>";</script>
|
||||
<?php $baseurl = App::get_baseurl(); ?>
|
||||
<?php $baseurl = Friendica\App::get_baseurl(); ?>
|
||||
<?php $frio = "view/theme/frio"; ?>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
|
||||
</head>
|
||||
|
|
|
|||
85
view/theme/frio/templates/admin_aside.tpl
Normal file
85
view/theme/frio/templates/admin_aside.tpl
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
<script>
|
||||
// update pending count //
|
||||
$(function(){
|
||||
$("nav").bind('nav-update', function(e,data){
|
||||
var elm = $('#pending-update');
|
||||
var register = $(data).find('register').text();
|
||||
if (register=="0") { register = ""; }
|
||||
elm.html(register);
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="widget">
|
||||
<h3><a href="{{$admurl}}">{{$admtxt}}</a></h3>
|
||||
|
||||
<ul role="menu">
|
||||
{{foreach $subpages as $name => $item}}
|
||||
<li role="menuitem" class="{{$item.2}}">
|
||||
<a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
|
||||
{{$item.1}}
|
||||
{{if $name == "users"}}
|
||||
<span id="pending-update" class="badge pull-right"></span>
|
||||
{{/if}}
|
||||
</a>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
|
||||
{{if $admin.update}}
|
||||
<ul role="menu">
|
||||
<li role="menuitem" class="{{$admin.update.2}}">
|
||||
<a href="{{$admin.update.0}}" {{if $admin.update.accesskey}}accesskey="{{$admin.update.accesskey}}"{{/if}}>
|
||||
{{$admin.update.1}}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
{{if $admin.plugins_admin}}
|
||||
<div class="widget">
|
||||
<h3>{{$plugadmtxt}}</h3>
|
||||
<ul role="menu">
|
||||
{{foreach $admin.plugins_admin as $name => $item}}
|
||||
<li role="menuitem" class="{{$item.2}}">
|
||||
<a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
|
||||
{{$item.1}}
|
||||
</a>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div class="widget">
|
||||
<h3>{{$logtxt}}</h3>
|
||||
<ul role="menu">
|
||||
<li role="menuitem" class="{{$admin.logs.2}}">
|
||||
<a href="{{$admin.logs.0}}" {{if $admin.logs.accesskey}}accesskey="{{$admin.logs.accesskey}}"{{/if}}>
|
||||
{{$admin.logs.1}}
|
||||
</a>
|
||||
</li>
|
||||
<li role="menuitem" class="{{$admin.viewlogs.2}}">
|
||||
<a href="{{$admin.viewlogs.0}}" {{if $admin.viewlogs.accesskey}}accesskey="{{$admin.viewlogs.accesskey}}"{{/if}}>
|
||||
{{$admin.viewlogs.1}}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="widget">
|
||||
<h3>{{$diagnosticstxt}}</h3>
|
||||
<ul role="menu">
|
||||
<li role="menuitem" class="{{$admin.diagnostics_probe.2}}">
|
||||
<a href="{{$admin.diagnostics_probe.0}}" {{if $admin.diagnostics_probe.accesskey}}accesskey="{{$admin.diagnostics_probe.accesskey}}"{{/if}}>
|
||||
{{$admin.diagnostics_probe.1}}
|
||||
</a>
|
||||
</li>
|
||||
<li role="menuitem" class="{{$admin.diagnostics_webfinger.2}}">
|
||||
<a href="{{$admin.diagnostics_webfinger.0}}" {{if $admin.viewlogs.accesskey}}accesskey="{{$admin.diagnostics_webfinger.accesskey}}"{{/if}}>
|
||||
{{$admin.diagnostics_webfinger.1}}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
|
||||
<div class="contact-wrapper media" id="contact-entry-wrapper-{{$contact.id}}" >
|
||||
<div class="contact-wrapper media" id="contact-entry-wrapper-{{$contact.id}}">
|
||||
|
||||
{{* This is a wrapper for the contact picture and the dropdown menu with contact relating actions *}}
|
||||
<div class="contact-photo-wrapper dropdown pull-left" >
|
||||
<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}" >
|
||||
<div class="contact-photo-wrapper dropdown media-left">
|
||||
<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}">
|
||||
|
||||
<button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{{$contact.id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
|
||||
<button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{{$contact.id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<div class="contact-photo-image-wrapper hidden-xs">
|
||||
<img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
|
||||
|
||||
|
|
@ -45,31 +45,74 @@
|
|||
</div>
|
||||
|
||||
<div class="media-body">
|
||||
{{if $contact.photo_menu}}
|
||||
{{* The contact actions like private mail, delete contact, edit contact and so on *}}
|
||||
<div class="contact-actions pull-right nav-pills preferences hidden-xs">
|
||||
{{if $contact.photo_menu.pm }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{{/if}}
|
||||
{{if $contact.photo_menu.poke }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{{/if}}
|
||||
{{if $contact.photo_menu.network}}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
|
||||
{{if $contact.photo_menu.edit }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
|
||||
{{if $contact.photo_menu.drop }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></button>{{/if}}
|
||||
{{if $contact.photo_menu.follow }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
|
||||
{{if $contact.photo_menu.hide }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}
|
||||
{{if $contact.photo_menu.pm}}
|
||||
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}">
|
||||
<i class="fa fa-envelope" aria-hidden="true"></i>
|
||||
</button>
|
||||
{{/if}}
|
||||
{{if $contact.photo_menu.poke}}
|
||||
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}">
|
||||
<i class="fa fa-heartbeat" aria-hidden="true"></i>
|
||||
</button>
|
||||
{{/if}}
|
||||
{{if $contact.photo_menu.network}}
|
||||
<a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}">
|
||||
<i class="fa fa-cloud" aria-hidden="true"></i>
|
||||
</a>
|
||||
{{/if}}
|
||||
{{if $contact.photo_menu.edit}}
|
||||
<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}">
|
||||
<i class="fa fa-user" aria-hidden="true"></i>
|
||||
</a>
|
||||
{{/if}}
|
||||
{{if $contact.photo_menu.drop}}
|
||||
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}">
|
||||
<i class="fa fa-user-times" aria-hidden="true"></i>
|
||||
</button>
|
||||
{{/if}}
|
||||
{{if $contact.photo_menu.follow}}
|
||||
<a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}">
|
||||
<i class="fa fa-user-plus" aria-hidden="true"></i>
|
||||
</a>
|
||||
{{/if}}
|
||||
{{if $contact.photo_menu.hide}}
|
||||
<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}">
|
||||
<i class="fa fa-times" aria-hidden="true"></i>
|
||||
</a>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{* The button to add or remove contacts from a contact group - group edit page *}}
|
||||
{{if $contact.change_member}}
|
||||
<div class="contact-group-actions pull-right nav-pills preferences">
|
||||
<button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({{$contact.change_member.gid}},{{$contact.change_member.cid}},'{{$contact.change_member.sec_token}}'); return true;" data-toggle="tooltip" title="{{$contact.change_member.title}}">
|
||||
{{if $contact.label == "members"}}
|
||||
<i class="fa fa-times-circle" aria-hidden="true"></i>
|
||||
{{elseif $contact.label == "contacts"}}
|
||||
<i class="fa fa-plus-circle" aria-hidden="true"></i>
|
||||
{{/if}}
|
||||
</button>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{* The contact description (e.g. Name, Network, kind of connection and so on *}}
|
||||
<div class="contact-entry-desc">
|
||||
<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >
|
||||
<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
|
||||
<h4 class="media-heading"><a href="{{$contact.url}}">{{$contact.name}}</a>
|
||||
{{if $contact.account_type}} <small class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</small>{{/if}}
|
||||
{{if $contact.account_type == 'Forum'}}<i class="fa fa-comments-o" aria-hidden="true"></i>{{/if}}
|
||||
{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
|
||||
</h4>
|
||||
</div>
|
||||
{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
|
||||
{{if $contact.itemurl}}<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
|
||||
{{if $contact.alt_text}}<div class="contact-entry-details contact-entry-rel" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
|
||||
{{if $contact.itemurl}}<div class="contact-entry-details contact-entry-url" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
|
||||
{{if $contact.tags}}<div class="contact-entry-details" id="contact-entry-tags-{{$contact.id}}" >{{$contact.tags}}</div>{{/if}}
|
||||
{{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
|
||||
{{if $contact.network}}<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
|
||||
{{if $contact.details}}<div class="contact-entry-details contact-entry-tags" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
|
||||
{{if $contact.network}}<div class="contact-entry-details contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
|
||||
</div>
|
||||
|
||||
{{* The checkbox to perform batch actions to these contacts (for batch actions have a look at contacts-template.tpl) *}}
|
||||
|
|
@ -88,13 +131,13 @@
|
|||
{{* the following part is a nearly a copy of the part above but it is modified for working with js.
|
||||
We use this part to filter the contacts with jquery.textcomplete *}}
|
||||
<div class="javascript-template" rel="contact-template" style="display: none">
|
||||
<div class="contact-wrapper media" id="contact-entry-wrapper-{$id}" >
|
||||
<div class="contact-wrapper media" id="contact-entry-wrapper-{$id}">
|
||||
|
||||
{{* This is a wrapper for the contact picture and the dropdown menu with contact relating actions *}}
|
||||
<div class="contact-photo-wrapper dropdown pull-left" >
|
||||
<div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}" >
|
||||
<div class="contact-photo-wrapper dropdown media-left">
|
||||
<div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}">
|
||||
|
||||
<button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" >
|
||||
<button type="button" class="btn btn-link dropdown-toggle" id="contact-photo-menu-{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<div class="contact-photo-image-wrapper hidden-xs">
|
||||
<img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name}" />
|
||||
|
||||
|
|
@ -135,19 +178,58 @@ We use this part to filter the contacts with jquery.textcomplete *}}
|
|||
</div>
|
||||
|
||||
<div class="media-body">
|
||||
{if $photo_menu}
|
||||
{{* The contact actions like private mail, delete contact, edit contact and so on *}}
|
||||
<div class="contact-actions pull-right nav-pills preferences hidden-xs">
|
||||
{if $photo_menu.pm}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{/if}
|
||||
{if $photo_menu.poke}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{/if}
|
||||
{if $photo_menu.network}<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{/if}
|
||||
{if $photo_menu.edit}<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{/if}
|
||||
{if $photo_menu.drop}<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{/if}
|
||||
{if $photo_menu.follow}<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{/if}
|
||||
{if $photo_menu.pm}
|
||||
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}">
|
||||
<i class="fa fa-envelope" aria-hidden="true"></i>
|
||||
</button>
|
||||
{/if}
|
||||
{if $photo_menu.poke}
|
||||
<button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}">
|
||||
<i class="fa fa-heartbeat" aria-hidden="true"></i>
|
||||
</button>
|
||||
{/if}
|
||||
{if $photo_menu.network}
|
||||
<a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}">
|
||||
<i class="fa fa-cloud" aria-hidden="true"></i>
|
||||
</a>
|
||||
{/if}
|
||||
{if $photo_menu.edit}
|
||||
<a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}">
|
||||
<i class="fa fa-pencil" aria-hidden="true"></i>
|
||||
</a>
|
||||
{/if}
|
||||
{if $photo_menu.drop}
|
||||
<a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}">
|
||||
<i class="fa fa-user-times" aria-hidden="true"></i>
|
||||
</a>
|
||||
{/if}
|
||||
{if $photo_menu.follow}
|
||||
<a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}">
|
||||
<i class="fa fa-user-plus" aria-hidden="true"></i>
|
||||
</a>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{{* The button to add or remove contacts from a contact group - group edit page *}}
|
||||
{if $contact.change_member}
|
||||
<div class="contact-group-actions pull-right nav-pills preferences">
|
||||
<button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({$contact.change_member.gid},{$contact.change_member.cid},'{$contact.change_member.sec_token}'); return true;" data-toggle="tooltip" title="{$contact.change_member.title}">
|
||||
{if $contact.label == "members"}
|
||||
<i class="fa fa-times-circle" aria-hidden="true"></i>
|
||||
{elseif $contact.label == "contacts"}
|
||||
<i class="fa fa-plus-circle" aria-hidden="true"></i>
|
||||
{/if}
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{{* The contact description (e.g. Name, Network, kind of connection and so on *}}
|
||||
<div class="contact-entry-desc">
|
||||
<div class="contact-entry-name" id="contact-entry-name-{$id}" >
|
||||
<div class="contact-entry-name" id="contact-entry-name-{$id}">
|
||||
<h4 class="media-heading"><a href="{$url}">{$name}</a>
|
||||
{if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if}
|
||||
{if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if}
|
||||
|
|
|
|||
12
view/theme/frio/templates/generic_links_widget.tpl
Normal file
12
view/theme/frio/templates/generic_links_widget.tpl
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
|
||||
<div class="widget{{if $class}} {{$class}}{{/if}}">
|
||||
{{if $title}}<h3>{{$title}}</h3>{{/if}}
|
||||
{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
|
||||
|
||||
<ul role="menu">
|
||||
{{foreach $items as $item}}
|
||||
<li role="menuitem" class="{{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>{{$item.label}}</a></li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
5
view/theme/frio/templates/group_drop.tpl
Normal file
5
view/theme/frio/templates/group_drop.tpl
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
{{* Link for deleting contact groups *}}
|
||||
<a href="group/drop/{{$id}}?t={{$form_security_token}}" onclick="return confirmDelete();" id="group-delete-icon-{{$id}}" class="btn btn-clear" title="{{$delete}}" data-toggle="tooltip">
|
||||
<i class="fa fa-trash" aria-hidden="true"></i>
|
||||
</a>
|
||||
77
view/theme/frio/templates/group_edit.tpl
Normal file
77
view/theme/frio/templates/group_edit.tpl
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
|
||||
{{* This template is for the "group" module. It provides the user the possibility to
|
||||
modify a specific contact group (remove contact group, edit contact group name,
|
||||
add or remove contacts to the contact group.
|
||||
*}}
|
||||
|
||||
<script type="text/javascript" src="view/theme/frio/js/mod_group.js"></script>
|
||||
|
||||
<div class="generic-page-wrapper">
|
||||
|
||||
{{* The buttons for editing the contact group (edit name / remove contact group) *}}
|
||||
<div class="group-actions pull-right">
|
||||
<button type="button" id="group-rename" class="btn btn-clear" onclick="openClose('group-edit-wrapper'); return false;" title="{{$edit_name}}" data-toggle="tooltip">
|
||||
<i class="fa fa-pencil" aria-hidden="true"></i>
|
||||
</button>
|
||||
{{if $drop}}{{$drop}}{{/if}}
|
||||
</div>
|
||||
|
||||
{{include file="section_title.tpl"}}
|
||||
|
||||
{{* Edit the name of the group *}}
|
||||
<div id="group-edit-wrapper" class="panel panel-inline">
|
||||
<form action="group/{{$gid}}" id="group-edit-form" method="post">
|
||||
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
|
||||
|
||||
{{include file="field_input.tpl" field=$gname}}
|
||||
<div id="group-edit-submit-wrapper" class="form-group pull-right">
|
||||
<button class="btn btn-primary btn-small" type="submit" name="submit" value="{{$submit|escape:'html'}}">
|
||||
{{$submit|escape:'html'}}
|
||||
</button>
|
||||
</div>
|
||||
<div id="group-edit-select-end" class="clear"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{* The search input field to search for contacts *}}
|
||||
<div id="contacts-search-wrapper">
|
||||
<div id="contacts-search-form" class="navbar-form" role="search">
|
||||
<div class="row">
|
||||
<div class="col-md-2"></div>
|
||||
<div class="col-md-8 ">
|
||||
<div class="form-group form-group-search">
|
||||
<input type="text"
|
||||
name="filter"
|
||||
id="contacts-search"
|
||||
class="search-input form-control form-search"
|
||||
onkeyup="filterList(); return false;"
|
||||
onfocus="this.select(); return false;"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-2"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
<div id="contacts-search-end"></div>
|
||||
|
||||
{{if $groupeditor}}
|
||||
{{* The buttons to switch between the different view modes *}}
|
||||
<div id="group-list-view-switcher" class="btn-group btn-group-sm pull-right">
|
||||
<botton type="button" id="group-list-big" class="active group-list-switcher btn btn-default">
|
||||
<i class="fa fa-align-justify" aria-hidden="true"></i>
|
||||
</botton>
|
||||
<button type="button" id="group-list-small" class="btn btn-default group-list-switcher">
|
||||
<i class="fa fa-th-large" aria-hidden="true"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
|
||||
{{* The contact group list *}}
|
||||
<div id="group-update-wrapper">
|
||||
{{include file="groupeditor.tpl"}}
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
19
view/theme/frio/templates/groupeditor.tpl
Normal file
19
view/theme/frio/templates/groupeditor.tpl
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
|
||||
{{* Template for the contact group list *}}
|
||||
<div id="group" class="contact_list">
|
||||
|
||||
<ul id="contact-group-list" class="viewcontact_wrapper media-list">
|
||||
|
||||
{{* The contacts who are already members of the contact group *}}
|
||||
{{foreach $groupeditor.members as $contact}}
|
||||
<li class="members active">{{include file="contact_template.tpl"}}</li>
|
||||
{{/foreach}}
|
||||
|
||||
{{* The contacts who are not members of the contact group *}}
|
||||
{{foreach $groupeditor.contacts as $contact}}
|
||||
<li class="contacts">{{include file="contact_template.tpl"}}</li>
|
||||
{{/foreach}}
|
||||
|
||||
</ul>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
|
||||
<button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore|escape:'html'}}" title="{{$ignore|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
|
||||
<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard|escape:'html'}}" title="{{$discard|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>
|
||||
{{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard|escape:'html'}}" title="{{$discard|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}}
|
||||
</form>
|
||||
</div>
|
||||
<div class='intro-enty-name'><h4 class="media-heading"><a href="{{$zrl}}">{{$fullname}}</a></h4></div>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
<div class="intro-action-buttons">
|
||||
<form class="intro-form pull-left" action="notifications/{{$intro_id}}" method="post">
|
||||
<button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}">{{$ignore|escape:'html'}}</button>
|
||||
<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}">{{$discard|escape:'html'}}</button>
|
||||
{{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}">{{$discard|escape:'html'}}</button> {{/if}}
|
||||
</form>
|
||||
<button class="btn btn-small btn-primary intro-submit-approve pull-right" onclick="addElmToModal('#intro-approve-wrapper-{{$contact_id}}')">{{$approve|escape:'html'}}</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@
|
|||
</div>
|
||||
<div class="pull-right">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li><a href="register" data-toggle="tooltip" title="{{$register.title}}"><i class="fa fa-street-view fa-fw"></i> {{$register.desc}}</a></li>
|
||||
<li><a href="register" data-toggle="tooltip" title="{{$nav.register.3}}"><i class="fa fa-street-view fa-fw"></i></a></li>
|
||||
<li>
|
||||
<a href="login?mode=none" id="nav-login"
|
||||
data-toggle="tooltip" title="{{$nav.login.3}}">
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
$frio = "view/theme/frio";
|
||||
|
||||
global $frio;
|
||||
|
|
@ -130,7 +132,7 @@ function frio_item_photo_menu(App $a, &$arr) {
|
|||
* Additionally the profile, status and photo page links will be changed
|
||||
* to don't open in a new tab if the contact is a friendica contact.
|
||||
*
|
||||
* @param app $a The app data
|
||||
* @param App $a The app data
|
||||
* @param array $args Contains contact data and the original photo_menu
|
||||
*/
|
||||
function frio_contact_photo_menu(App $a, &$args){
|
||||
|
|
@ -182,7 +184,7 @@ function frio_contact_photo_menu(App $a, &$args){
|
|||
* Some links will point to the local pages because the user would expect
|
||||
* local page (these pages are: search, community, help, apps, directory).
|
||||
*
|
||||
* @param app $a The App class
|
||||
* @param App $a The App class
|
||||
* @param array $nav The original nav menu
|
||||
*/
|
||||
function frio_remote_nav($a,&$nav) {
|
||||
|
|
@ -271,7 +273,7 @@ function frio_remote_nav($a,&$nav) {
|
|||
* @param App $a The app data @TODO Unused
|
||||
* @param array $results The array with the originals from acl_lookup()
|
||||
*/
|
||||
function frio_acl_lookup($a, &$results) {
|
||||
function frio_acl_lookup(App $a, &$results) {
|
||||
require_once("mod/contacts.php");
|
||||
|
||||
$nets = ((x($_GET,"nets")) ? notags(trim($_GET["nets"])) : "");
|
||||
|
|
|
|||
|
|
@ -1,45 +1,45 @@
|
|||
<!DOCTYPE html >
|
||||
<html lang="<?php echo $lang; ?>">
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
|
||||
<?php if( $a->module === 'home' ) { ?>
|
||||
<center>
|
||||
<div class="login-button">
|
||||
<a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a>
|
||||
</div>
|
||||
</center>
|
||||
|
||||
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
|
||||
?>
|
||||
<div class='section-wrapper'>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
</section>
|
||||
</div>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
|
||||
<?php } else { ?>
|
||||
<div class='main-container'>
|
||||
<!-- <div class='main-content-container'>-->
|
||||
<div class='section-wrapper'>
|
||||
<?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
|
||||
<section>
|
||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
</div>
|
||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
||||
<?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
<?php } ?>
|
||||
<?php if(x($page,'end')) echo $page['end']; ?>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html >
|
||||
<html lang="<?php echo $lang; ?>">
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
|
||||
<?php if( $a->module === 'home' ) { ?>
|
||||
<center>
|
||||
<div class="login-button">
|
||||
<a href="login" class="login-button-link"><img class="login-button-image" src="images/friendica-1600.png" title="Click to log in"></a>
|
||||
</div>
|
||||
</center>
|
||||
|
||||
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
|
||||
?>
|
||||
<div class='section-wrapper'>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
</section>
|
||||
</div>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
|
||||
<?php } else { ?>
|
||||
<div class='main-container'>
|
||||
<!-- <div class='main-content-container'>-->
|
||||
<div class='section-wrapper'>
|
||||
<?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
|
||||
<section>
|
||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
</div>
|
||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
||||
<?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
<?php } ?>
|
||||
<?php if(x($page,'end')) echo $page['end']; ?>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
* Maintainer: Zach P <techcity@f.shmuz.in>
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
function frost_mobile_init(App $a) {
|
||||
$a->sourcename = 'Friendica mobile web';
|
||||
$a->videowidth = 250;
|
||||
|
|
|
|||
|
|
@ -1,43 +1,43 @@
|
|||
<!DOCTYPE html >
|
||||
<html lang="<?php echo $lang; ?>">
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
|
||||
<?php if( $a->module === 'home' ) { ?>
|
||||
<center>
|
||||
<div class="login-button">
|
||||
<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>
|
||||
</div>
|
||||
</center>
|
||||
|
||||
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
|
||||
?>
|
||||
<div class='section-wrapper'>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
</section>
|
||||
</div>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
|
||||
<?php } else { ?>
|
||||
<div class='main-container'>
|
||||
<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
|
||||
<div class='main-content-container'>
|
||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
||||
<section>
|
||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<?php if(x($page,'end')) echo $page['end']; ?>
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html >
|
||||
<html lang="<?php echo $lang; ?>">
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
|
||||
<?php if( $a->module === 'home' ) { ?>
|
||||
<center>
|
||||
<div class="login-button">
|
||||
<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>
|
||||
</div>
|
||||
</center>
|
||||
|
||||
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
|
||||
?>
|
||||
<div class='section-wrapper'>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
</section>
|
||||
</div>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
|
||||
<?php } else { ?>
|
||||
<div class='main-container'>
|
||||
<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
|
||||
<div class='main-content-container'>
|
||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
||||
<section>
|
||||
<?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="pause"></div> <!-- The pause/resume Ajax indicator -->
|
||||
<div id="page-footer"></div>
|
||||
</section>
|
||||
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<?php if(x($page,'end')) echo $page['end']; ?>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
* Maintainer: Zach P <techcity@f.shmuz.in>
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
function frost_init(App $a) {
|
||||
$a->videowidth = 400;
|
||||
$a->videoheight = 330;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Theme settings
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
function theme_content(App $a) {
|
||||
if (!local_user()) {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
* Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
function quattro_init(App $a) {
|
||||
$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
|
||||
$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/js/quattro.js"></script>';;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
|
||||
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
|
||||
<script>var baseurl="<?php echo Friendica\App::get_baseurl() ?>";</script>
|
||||
<script type="text/javascript">
|
||||
function ScrollToBottom(){
|
||||
window.scrollTo(0,document.body.scrollHeight);
|
||||
|
|
|
|||
|
|
@ -10,13 +10,15 @@
|
|||
* Screenshot: <a href="screenshot.png">Screenshot</a>
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
function smoothly_init(App $a) {
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
$cssFile = null;
|
||||
$ssl_state = null;
|
||||
$baseurl = App::get_baseurl($ssl_state);
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
|
||||
<script>
|
||||
function insertFormatting(BBcode, id) {
|
||||
|
|
@ -99,13 +101,12 @@ $(document).ready(function() {
|
|||
</script>
|
||||
EOT;
|
||||
|
||||
/** custom css **/
|
||||
/** custom css **/
|
||||
if (!is_null($cssFile)) {
|
||||
$a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
|
||||
}
|
||||
|
||||
_js_in_foot();
|
||||
|
||||
_js_in_foot();
|
||||
}
|
||||
|
||||
if (! function_exists('_js_in_foot')) {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Theme settings
|
||||
*/
|
||||
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
function theme_content(App $a) {
|
||||
if (!local_user()) {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
* Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
|
||||
require_once "include/plugin.php";
|
||||
require_once "include/socgraph.php";
|
||||
require_once "mod/proxy.php";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue