Merge develop-new into event-attendance-new
Conflicts: include/conversation.php
This commit is contained in:
rabuzarus
commit
649578ae33
75 changed files with 20240 additions and 18748 deletions
11200
view/de/messages.po
11200
view/de/messages.po
File diff suppressed because it is too large
Load diff
2006
view/de/strings.php
2006
view/de/strings.php
File diff suppressed because it is too large
Load diff
11198
view/it/messages.po
11198
view/it/messages.po
File diff suppressed because it is too large
Load diff
2008
view/it/strings.php
2008
view/it/strings.php
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,3 @@
|
|||
|
||||
|
||||
<h1>{{$header}}</h1>
|
||||
|
||||
{{if $myaddr == ""}}
|
||||
|
|
@ -30,6 +28,11 @@
|
|||
<img src="{{$photo}}" alt="" id="dfrn-request-photo">
|
||||
{{/if}}
|
||||
|
||||
{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
|
||||
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
|
||||
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
|
||||
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
|
||||
|
||||
<div id="dfrn-request-url-wrapper" >
|
||||
<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
|
||||
{{if $myaddr}}
|
||||
|
|
|
|||
|
|
@ -51,6 +51,9 @@
|
|||
{{if $lblsuggest}}
|
||||
<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
|
||||
{{/if}}
|
||||
{{if $follow}}
|
||||
<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>
|
||||
{{/if}}
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,11 @@
|
|||
<img src="{{$photo}}" alt="" id="dfrn-request-photo">
|
||||
{{/if}}
|
||||
|
||||
{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
|
||||
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
|
||||
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
|
||||
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
|
||||
|
||||
<div id="dfrn-request-url-wrapper" >
|
||||
<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
|
||||
{{if $myaddr}}
|
||||
|
|
|
|||
9
view/templates/http_status.tpl
Normal file
9
view/templates/http_status.tpl
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>{{$title}}</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>{{$title}}</h1>
|
||||
<p>{{$description}}</p>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
<h2>{{$header}}</h2>
|
||||
|
||||
<div class="intro-wrapper" id="intro-{{$contact_id}}" >
|
||||
|
||||
<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
|
||||
<a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div></a>
|
||||
<img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
|
||||
<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>
|
||||
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
|
||||
{{if $gender}}<dl><dt>{{$gender_label}}</dt><dd>{{$gender}}</dd></dl>{{/if}}
|
||||
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,25 @@
|
|||
|
||||
<div class="profile-match-wrapper">
|
||||
<div class="profile-match-photo">
|
||||
<div class="profile-match-photo" id="contact-entry-photo-{{$id}}"
|
||||
onmouseover="if (typeof t{{$id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$id}}')"
|
||||
onmouseout="t{{$id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$id}}\'); closeMenu(\'contact-photo-menu-{{$id}}\');',200)" >
|
||||
<a href="{{$url}}">
|
||||
<img width="80" height="80" src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
|
||||
</a>
|
||||
{{if $photo_menu}}
|
||||
<span onclick="openClose('contact-photo-menu-{{$id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$id}}">menu</span>
|
||||
<div class="contact-photo-menu" id="contact-photo-menu-{{$id}}">
|
||||
<ul>
|
||||
{{foreach $photo_menu as $k=>$c}}
|
||||
{{if $c.2}}
|
||||
<li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
|
||||
{{else}}
|
||||
<li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="profile-match-break"></div>
|
||||
<div class="profile-match-name">
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@
|
|||
{{include file="field_checkbox.tpl" field=$nosmile}}
|
||||
{{include file="field_checkbox.tpl" field=$noinfo}}
|
||||
{{include file="field_checkbox.tpl" field=$infinite_scroll}}
|
||||
<h2>{{$calendar_title}}</h2>
|
||||
{{include file="field_select.tpl" field=$first_day_of_week}}
|
||||
|
||||
|
||||
<div class="settings-submit-wrapper" >
|
||||
|
|
|
|||
1
view/templates/theme_admin_settings.tpl
Normal file
1
view/templates/theme_admin_settings.tpl
Normal file
|
|
@ -0,0 +1 @@
|
|||
{{* Dummy file to avoid errors when installing themes *}}
|
||||
|
|
@ -9,6 +9,9 @@ function theme_content(&$a){
|
|||
if(!local_user())
|
||||
return;
|
||||
|
||||
if (!function_exists('get_vier_config'))
|
||||
return;
|
||||
|
||||
$style = get_pconfig(local_user(), 'vier', 'style');
|
||||
|
||||
if ($style == "")
|
||||
|
|
@ -17,7 +20,15 @@ function theme_content(&$a){
|
|||
if ($style == "")
|
||||
$style = "plus";
|
||||
|
||||
return vier_form($a,$style);
|
||||
$show_pages = get_vier_config('show_pages', true);
|
||||
$show_profiles = get_vier_config('show_profiles', true);
|
||||
$show_helpers = get_vier_config('show_helpers', true);
|
||||
$show_services = get_vier_config('show_services', true);
|
||||
$show_friends = get_vier_config('show_friends', true);
|
||||
$show_lastusers = get_vier_config('show_lastusers', true);
|
||||
|
||||
return vier_form($a,$style, $show_pages, $show_profiles, $show_helpers,
|
||||
$show_services, $show_friends, $show_lastusers);
|
||||
}
|
||||
|
||||
function theme_post(&$a){
|
||||
|
|
@ -26,23 +37,60 @@ function theme_post(&$a){
|
|||
|
||||
if (isset($_POST['vier-settings-submit'])){
|
||||
set_pconfig(local_user(), 'vier', 'style', $_POST['vier_style']);
|
||||
set_pconfig(local_user(), 'vier', 'show_pages', $_POST['vier_show_pages']);
|
||||
set_pconfig(local_user(), 'vier', 'show_profiles', $_POST['vier_show_profiles']);
|
||||
set_pconfig(local_user(), 'vier', 'show_helpers', $_POST['vier_show_helpers']);
|
||||
set_pconfig(local_user(), 'vier', 'show_services', $_POST['vier_show_services']);
|
||||
set_pconfig(local_user(), 'vier', 'show_friends', $_POST['vier_show_friends']);
|
||||
set_pconfig(local_user(), 'vier', 'show_lastusers', $_POST['vier_show_lastusers']);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function theme_admin(&$a){
|
||||
|
||||
if (!function_exists('get_vier_config'))
|
||||
return;
|
||||
|
||||
$style = get_config('vier', 'style');
|
||||
return vier_form($a,$style);
|
||||
|
||||
$helperlist = get_config('vier', 'helperlist');
|
||||
|
||||
if ($helperlist == "")
|
||||
$helperlist = "https://helpers.pyxis.uberspace.de/profile/helpers";
|
||||
|
||||
$t = get_markup_template("theme_admin_settings.tpl");
|
||||
$o .= replace_macros($t, array(
|
||||
'$helperlist' => array('vier_helperlist', t('Comma separated list of helper forums'), $helperlist, '', ''),
|
||||
));
|
||||
|
||||
$show_pages = get_vier_config('show_pages', true, true);
|
||||
$show_profiles = get_vier_config('show_profiles', true, true);
|
||||
$show_helpers = get_vier_config('show_helpers', true, true);
|
||||
$show_services = get_vier_config('show_services', true, true);
|
||||
$show_friends = get_vier_config('show_friends', true, true);
|
||||
$show_lastusers = get_vier_config('show_lastusers', true, true);
|
||||
$o .= vier_form($a,$style, $show_pages, $show_profiles, $show_helpers, $show_services,
|
||||
$show_friends, $show_lastusers);
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
function theme_admin_post(&$a){
|
||||
if (isset($_POST['vier-settings-submit'])){
|
||||
set_config('vier', 'style', $_POST['vier_style']);
|
||||
set_config('vier', 'show_pages', $_POST['vier_show_pages']);
|
||||
set_config('vier', 'show_profiles', $_POST['vier_show_profiles']);
|
||||
set_config('vier', 'show_helpers', $_POST['vier_show_helpers']);
|
||||
set_config('vier', 'show_services', $_POST['vier_show_services']);
|
||||
set_config('vier', 'show_friends', $_POST['vier_show_friends']);
|
||||
set_config('vier', 'show_lastusers', $_POST['vier_show_lastusers']);
|
||||
set_config('vier', 'helperlist', $_POST['vier_helperlist']);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function vier_form(&$a, $style){
|
||||
function vier_form(&$a, $style, $show_pages, $show_profiles, $show_helpers, $show_services, $show_friends, $show_lastusers){
|
||||
$styles = array(
|
||||
"plus"=>"Plus",
|
||||
"breathe"=>"Breathe",
|
||||
|
|
@ -51,12 +99,21 @@ function vier_form(&$a, $style){
|
|||
"netcolour"=>"Coloured Networks",
|
||||
"flat"=>"Flat"
|
||||
);
|
||||
$t = get_markup_template("theme_settings.tpl" );
|
||||
|
||||
$show_or_not = array('0'=>t("don't show"), '1'=>t("show"),);
|
||||
|
||||
$t = get_markup_template("theme_settings.tpl");
|
||||
$o .= replace_macros($t, array(
|
||||
'$submit' => t('Submit'),
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$title' => t("Theme settings"),
|
||||
'$style' => array('vier_style',t ('Set style'),$style,'',$styles),
|
||||
'$show_pages' => array('vier_show_pages', t('Community Pages'), $show_pages, '', $show_or_not),
|
||||
'$show_profiles' => array('vier_show_profiles', t('Community Profiles'), $show_profiles, '', $show_or_not),
|
||||
'$show_helpers' => array('vier_show_helpers', t('Help or @NewHere ?'), $show_helpers, '', $show_or_not),
|
||||
'$show_services' => array('vier_show_services', t('Connect Services'), $show_services, '', $show_or_not),
|
||||
'$show_friends' => array('vier_show_friends', t('Find Friends'), $show_friends, '', $show_or_not),
|
||||
'$show_lastusers' => array('vier_show_lastusers', t('Last users'), $show_lastusers, '', $show_or_not)
|
||||
));
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
3
view/theme/vier/hide.css
Normal file
3
view/theme/vier/hide.css
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
aside {
|
||||
display: none;
|
||||
}
|
||||
12
view/theme/vier/narrow.css
Normal file
12
view/theme/vier/narrow.css
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
#nav-user-linklabel {
|
||||
display: none;
|
||||
}
|
||||
|
||||
nav ul li .menu-popup {
|
||||
left: auto;
|
||||
right: 0px;
|
||||
}
|
||||
|
||||
nav #search-box #search-text {
|
||||
width: 100px;
|
||||
}
|
||||
154
view/theme/vier/shadow.css
Normal file
154
view/theme/vier/shadow.css
Normal file
|
|
@ -0,0 +1,154 @@
|
|||
nav {
|
||||
background: rgb(36, 76, 94);
|
||||
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
|
||||
padding: 0px;
|
||||
padding-left: 0px;
|
||||
}
|
||||
|
||||
nav a:active,
|
||||
nav a:link,
|
||||
nav a:visited,
|
||||
nav a {
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
nav a:hover,
|
||||
#nav-messages-see-all a:hover {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
nav .nav-notify {
|
||||
background-color: #F80;
|
||||
top: 0px;
|
||||
right: -5px;
|
||||
padding: 1px 3px;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
}
|
||||
// -----
|
||||
nav .nav-menu-icon .nav-notify {
|
||||
top: 0px;
|
||||
}
|
||||
|
||||
nav .nav-menu.selected a {
|
||||
color: #000;
|
||||
/* font-weight: bold; */
|
||||
}
|
||||
|
||||
nav .nav-menu:hover,
|
||||
nav .nav-menu.selected {
|
||||
border-bottom: 2px solid #427FED;
|
||||
}
|
||||
|
||||
nav .nav-menu {
|
||||
height: 23px;
|
||||
font-size: 14px;
|
||||
font-weight: initial;
|
||||
}
|
||||
|
||||
#nav-site-menu,
|
||||
#nav-notifications-menu,
|
||||
#nav-user-menu {
|
||||
top: 35px;
|
||||
}
|
||||
|
||||
#nav-messages-menu {
|
||||
top: 32px;
|
||||
}
|
||||
|
||||
#nav-messages-see-all a {
|
||||
color: #737373;
|
||||
}
|
||||
|
||||
ul.tabs li .active, span.pager_current a {
|
||||
border-bottom: 2px solid #427FED;
|
||||
}
|
||||
|
||||
span.pager_current, span.pager_n a:hover,
|
||||
span.pager_first a:hover, span.pager_last a:hover,
|
||||
span.pager_prev a:hover, span.pager_next a:hover,
|
||||
ul.tabs a:hover {
|
||||
border-bottom: 2px solid #427FED;
|
||||
}
|
||||
|
||||
nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
|
||||
color: #737373;
|
||||
}
|
||||
|
||||
nav #nav-messages-linkmenu.selected,
|
||||
nav #nav-user-linklabel.selected,
|
||||
nav #nav-apps-link.selected {
|
||||
background-color: #fff;
|
||||
border-bottom-style: none;
|
||||
}
|
||||
|
||||
div.jGrowl div.info {
|
||||
background: #fff url("../../../images/icons/48/info.png") no-repeat 5px center;
|
||||
}
|
||||
|
||||
div.jGrowl div.notice {
|
||||
color: #737373;
|
||||
}
|
||||
div.jGrowl div.info {
|
||||
color: #737373;
|
||||
}
|
||||
|
||||
.birthday-notice, .event-notice {
|
||||
font-weight: initial;
|
||||
}
|
||||
|
||||
div.pager, ul.tabs {
|
||||
font-weight: initial;
|
||||
}
|
||||
|
||||
nav .nav-menu-icon.selected {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
#jot #jot-tools li:hover {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
nav .icon {
|
||||
color: #737373;
|
||||
}
|
||||
|
||||
nav a:hover .icon {
|
||||
color: #000;
|
||||
}
|
||||
|
||||
ul.menu-popup {
|
||||
border: 0px solid #FFF;
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
header #banner a, header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover {
|
||||
color: #737373;
|
||||
}
|
||||
|
||||
header {
|
||||
left: 10px;
|
||||
}
|
||||
|
||||
header #banner {
|
||||
margin-top: 6px;
|
||||
}
|
||||
|
||||
#banner #logo-text {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
aside {
|
||||
top: 44px;
|
||||
height: calc(100% - 54px);
|
||||
}
|
||||
|
||||
section {
|
||||
top: 44px;
|
||||
}
|
||||
|
||||
nav #search-box #search-text {
|
||||
background-color: initial;
|
||||
border-style: solid;
|
||||
border-width: 1px;
|
||||
border-color: rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
|
|
@ -375,7 +375,7 @@ code {
|
|||
.tool a {
|
||||
/* color: #000; */
|
||||
}
|
||||
.tool a:hover, .widget a:hover, #nets-sidear a:hover, #hide-forum-list:hover, .admin.link a:hover, aside h4 a:hover {
|
||||
.tool a:hover, .widget a:hover, #nets-sidear a:hover, #hide-forum-list:hover, .admin.link a:hover, aside h4 a:hover, right_aside h4 a:hover {
|
||||
/* text-decoration: underline; */
|
||||
text-decoration: none;
|
||||
color: black;
|
||||
|
|
@ -390,8 +390,8 @@ code {
|
|||
}
|
||||
|
||||
.sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover,
|
||||
#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover,
|
||||
.nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, #message-new:hover {
|
||||
#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover, #forum-list-right div:hover,
|
||||
.nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover {
|
||||
/* background-color: #ddd; */
|
||||
/* background-color: #e5e5e5; */
|
||||
background-color: #F5F5F5;
|
||||
|
|
@ -409,7 +409,7 @@ code {
|
|||
font-weight: bold;
|
||||
}
|
||||
|
||||
#sidebar-new-group, #hide-forum-list, #forum-list, #sidebar-ungrouped,
|
||||
#sidebar-new-group, #hide-forum-list, #forum-list, #forum-list-right, #sidebar-ungrouped,
|
||||
.side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
|
||||
padding-left: 10px;
|
||||
padding-top: 3px;
|
||||
|
|
@ -418,7 +418,7 @@ code {
|
|||
display: block;
|
||||
}
|
||||
|
||||
a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a {
|
||||
a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a {
|
||||
display: block;
|
||||
color: #737373;
|
||||
}
|
||||
|
|
@ -445,11 +445,11 @@ a.sidebar-group-element {
|
|||
color: black;
|
||||
}
|
||||
|
||||
#forum-list a, .tool a, .admin.link a {
|
||||
#forum-list a, #forum-list-right a, .tool a, .admin.link a {
|
||||
color: #737373;
|
||||
}
|
||||
|
||||
#forum-list {
|
||||
#forum-list, #forum-list-right {
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
|
|
@ -874,7 +874,7 @@ ul.menu-popup .empty {
|
|||
right_aside {
|
||||
width: 0px;
|
||||
top: 32px;
|
||||
display: block;
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* aside */
|
||||
|
|
@ -970,7 +970,7 @@ aside #profiles-menu {
|
|||
left: 10px;
|
||||
}
|
||||
|
||||
aside #search-text, aside #side-follow-url, aside #side-peoplefind-url {
|
||||
aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_aside input {
|
||||
width: 140px;
|
||||
height: 17px;
|
||||
padding-left: 10px;
|
||||
|
|
@ -984,7 +984,7 @@ aside #search-text, aside #side-follow-url, aside #side-peoplefind-url {
|
|||
-moz-border-right-colors: #dbdbdb;*/
|
||||
}
|
||||
|
||||
aside h4 {
|
||||
aside h4, right_aside h4 {
|
||||
margin-bottom: 0px;
|
||||
margin-top: 0px;
|
||||
font-size: 1.17em;
|
||||
|
|
|
|||
|
|
@ -26,5 +26,3 @@ else if ($style == "dark")
|
|||
$stylecss = file_get_contents('view/theme/vier/dark.css');
|
||||
|
||||
echo $stylecss;
|
||||
|
||||
|
||||
|
|
|
|||
2
view/theme/vier/templates/ch_connectors.tpl
Normal file
2
view/theme/vier/templates/ch_connectors.tpl
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
<a href="{{$url}}/settings/connectors"><img alt="{{$alt_text}}" src="{{$photo}}" title="{{$alt_text}}"></a>
|
||||
|
||||
11
view/theme/vier/templates/ch_directory_item.tpl
Normal file
11
view/theme/vier/templates/ch_directory_item.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
|
||||
<div class="directory-item" id="directory-item-{{$id}}" >
|
||||
<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" >
|
||||
<div class="directory-photo" id="directory-photo-{{$id}}" >
|
||||
<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
|
||||
<img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
1
view/theme/vier/templates/ch_helpers.tpl
Normal file
1
view/theme/vier/templates/ch_helpers.tpl
Normal file
|
|
@ -0,0 +1 @@
|
|||
<li class="tool" role="menuitem"><a href="{{$url}}" title="{{$title}}" target="blank">{{$title}}</a></li>
|
||||
72
view/theme/vier/templates/communityhome.tpl
Normal file
72
view/theme/vier/templates/communityhome.tpl
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{{if $page}}
|
||||
<div id="right_pages" class="widget">
|
||||
<div>{{$page}}</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $comunity_profiles_title}}
|
||||
<div id="right_profiles" class="widget">
|
||||
<h3>{{$comunity_profiles_title}}</h3>
|
||||
<div id='lastusers-wrapper' class='items-wrapper'>
|
||||
{{foreach $comunity_profiles_items as $i}}
|
||||
{{$i}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $helpers}}
|
||||
<div id="right_helpers" class="widget">
|
||||
<h3>{{$helpers.title.1}}</h3>
|
||||
<ul role="menu">
|
||||
{{foreach $helpers_items as $i}}
|
||||
{{$i}}
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $con_services}}
|
||||
<div id="right_services" class="widget">
|
||||
<h3>{{$con_services.title.1}}</h3>
|
||||
<div id="right_services_icons">
|
||||
{{foreach $connector_items as $i}}
|
||||
{{$i}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $nv}}
|
||||
<div id="right_friends" class="widget">
|
||||
<h3>{{$nv.title.1}}</h3>
|
||||
<ul role="menu">
|
||||
<li class="tool" role="menuitem"><a class="{{$nv.directory.2}}" href="{{$nv.directory.0}}" title="{{$nv.directory.3}}" >{{$nv.directory.1}}</a></li>
|
||||
<li class="tool" role="menuitem"><a class="{{$nv.global_directory.2}}" href="{{$nv.global_directory.0}}" target="blank" title="{{$nv.global_directory.3}}" >{{$nv.global_directory.1}}</a></li>
|
||||
<li class="tool" role="menuitem"><a class="{{$nv.match.2}}" href="{{$nv.match.0}}" title="{{$nv.match.3}}" >{{$nv.match.1}}</a></li>
|
||||
<li class="tool" role="menuitem"><a class="{{$nv.suggest.2}}" href="{{$nv.suggest.0}}" title="{{$nv.suggest.3}}" >{{$nv.suggest.1}}</a></li>
|
||||
<li class="tool" role="menuitem"><a class="{{$nv.invite.2}}" href="{{$nv.invite.0}}" title="{{$nv.invite.3}}" >{{$nv.invite.1}}</a></li>
|
||||
</ul>
|
||||
{{$nv.search}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $lastusers_title}}
|
||||
<div id="right_lastusers" class="widget">
|
||||
<h3>{{$lastusers_title}}</h3>
|
||||
<div id='lastusers-wrapper' class='items-wrapper'>
|
||||
{{foreach $lastusers_items as $i}}
|
||||
{{$i}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $activeusers_title}}
|
||||
<h3>{{$activeusers_title}}</h3>
|
||||
<div class='items-wrapper'>
|
||||
{{foreach $activeusers_items as $i}}
|
||||
{{$i}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
{{/if}}
|
||||
1
view/theme/vier/templates/theme_admin_settings.tpl
Normal file
1
view/theme/vier/templates/theme_admin_settings.tpl
Normal file
|
|
@ -0,0 +1 @@
|
|||
{{include file="field_input.tpl" field=$helperlist}}
|
||||
|
|
@ -1,5 +1,11 @@
|
|||
|
||||
{{include file="field_select.tpl" field=$style}}
|
||||
{{include file="field_select.tpl" field=$show_pages}}
|
||||
{{include file="field_select.tpl" field=$show_profiles}}
|
||||
{{include file="field_select.tpl" field=$show_helpers}}
|
||||
{{include file="field_select.tpl" field=$show_services}}
|
||||
{{include file="field_select.tpl" field=$show_friends}}
|
||||
{{include file="field_select.tpl" field=$show_lastusers}}
|
||||
|
||||
<div class="settings-submit-wrapper">
|
||||
<input type="submit" value="{{$submit}}" class="settings-submit" name="vier-settings-submit" />
|
||||
|
|
|
|||
|
|
@ -9,14 +9,28 @@
|
|||
* Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
|
||||
*/
|
||||
|
||||
require_once("mod/nodeinfo.php");
|
||||
require_once("mod/proxy.php");
|
||||
require_once("include/socgraph.php");
|
||||
|
||||
function vier_init(&$a) {
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
$baseurl = $a->get_baseurl();
|
||||
$a->theme_events_in_profile = false;
|
||||
|
||||
$a->theme_info = array();
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
$baseurl = $a->get_baseurl();
|
||||
|
||||
$a->theme_info = array();
|
||||
|
||||
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()) {
|
||||
vier_community_info();
|
||||
|
||||
$a->page['htmlhead'] .= "<link rel='stylesheet' media='screen and (min-width: 1300px)' href='view/theme/vier/wide.css' />";
|
||||
}
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<link rel='stylesheet' media='screen and (max-width: 1100px)' href='view/theme/vier/narrow.css' />
|
||||
<script type="text/javascript">
|
||||
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
|
@ -68,5 +82,269 @@ function cmtBbClose(id) {
|
|||
}
|
||||
</script>
|
||||
EOT;
|
||||
|
||||
// Hide the left menu bar
|
||||
if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications",
|
||||
"probe", "webfinger", "login", "invite")))
|
||||
$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
|
||||
}
|
||||
|
||||
function get_vier_config($key, $default = false, $admin = false) {
|
||||
if (local_user() AND !$admin) {
|
||||
$result = get_pconfig(local_user(), "vier", $key);
|
||||
if ($result !== false)
|
||||
return $result;
|
||||
}
|
||||
|
||||
$result = get_config("vier", $key);
|
||||
if ($result !== false)
|
||||
return $result;
|
||||
|
||||
return $default;
|
||||
}
|
||||
|
||||
function vier_community_info() {
|
||||
$a = get_app();
|
||||
|
||||
$show_pages = get_vier_config("show_pages", 1);
|
||||
$show_profiles = get_vier_config("show_profiles", 1);
|
||||
$show_helpers = get_vier_config("show_helpers", 1);
|
||||
$show_services = get_vier_config("show_services", 1);
|
||||
$show_friends = get_vier_config("show_friends", 1);
|
||||
$show_lastusers = get_vier_config("show_lastusers", 1);
|
||||
|
||||
//get_baseurl
|
||||
$url = $a->get_baseurl($ssl_state);
|
||||
$aside['$url'] = $url;
|
||||
|
||||
// comunity_profiles
|
||||
if($show_profiles) {
|
||||
|
||||
$r = suggestion_query(local_user(), 0, 9);
|
||||
|
||||
$tpl = get_markup_template('ch_directory_item.tpl');
|
||||
if(count($r)) {
|
||||
|
||||
$aside['$comunity_profiles_title'] = t('Community Profiles');
|
||||
$aside['$comunity_profiles_items'] = array();
|
||||
|
||||
foreach($r as $rr) {
|
||||
$entry = replace_macros($tpl,array(
|
||||
'$id' => $rr['id'],
|
||||
//'$profile_link' => zrl($rr['url']),
|
||||
'$profile_link' => $a->get_baseurl().'/follow/?url='.urlencode($rr['url']),
|
||||
'$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_MICRO),
|
||||
'$alt_text' => $rr['name'],
|
||||
));
|
||||
$aside['$comunity_profiles_items'][] = $entry;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// last 9 users
|
||||
if($show_lastusers) {
|
||||
$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 ");
|
||||
$order = " ORDER BY `register_date` DESC ";
|
||||
|
||||
$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
|
||||
FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
|
||||
0, 9);
|
||||
|
||||
$tpl = get_markup_template('ch_directory_item.tpl');
|
||||
if(count($r)) {
|
||||
|
||||
$aside['$lastusers_title'] = t('Last users');
|
||||
$aside['$lastusers_items'] = array();
|
||||
|
||||
foreach($r as $rr) {
|
||||
$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
|
||||
$entry = replace_macros($tpl,array(
|
||||
'$id' => $rr['id'],
|
||||
'$profile_link' => $profile_link,
|
||||
'$photo' => $a->get_cached_avatar_image($rr['thumb']),
|
||||
'$alt_text' => $rr['name']));
|
||||
$aside['$lastusers_items'][] = $entry;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//right_aside FIND FRIENDS
|
||||
if ($show_friends AND local_user()) {
|
||||
$nv = array();
|
||||
$nv['title'] = Array("", t('Find Friends'), "", "");
|
||||
$nv['directory'] = Array('directory', t('Local Directory'), "", "");
|
||||
$nv['global_directory'] = Array(get_server(), t('Global Directory'), "", "");
|
||||
$nv['match'] = Array('match', t('Similar Interests'), "", "");
|
||||
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
|
||||
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
|
||||
|
||||
$nv['search'] = '<form name="simple_bar" method="get" action="'.$a->get_baseurl().'/dirfind">
|
||||
<span class="sbox_l"></span>
|
||||
<span class="sbox">
|
||||
<input type="text" name="search" size="13" maxlength="50">
|
||||
</span>
|
||||
<span class="sbox_r" id="srch_clear"></span>';
|
||||
|
||||
$aside['$nv'] = $nv;
|
||||
}
|
||||
|
||||
//Community_Pages at right_aside
|
||||
if($show_pages AND local_user()) {
|
||||
|
||||
$pagelist = array();
|
||||
|
||||
$contacts = q("SELECT `id`, `url`, `name`, `micro` FROM `contact`
|
||||
WHERE `network`= '%s' AND `forum` AND `uid` = %d AND
|
||||
NOT `hidden` AND NOT `blocked` AND
|
||||
NOT `archive` AND NOT `pending` AND
|
||||
`success_update` > `failure_update`
|
||||
ORDER BY `name` ASC",
|
||||
dbesc(NETWORK_DFRN), intval($a->user['uid']));
|
||||
|
||||
$pageD = array();
|
||||
|
||||
// Look if the profile is a community page
|
||||
foreach($contacts as $contact) {
|
||||
$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
|
||||
};
|
||||
|
||||
$contacts = $pageD;
|
||||
|
||||
if ($contacts) {
|
||||
$page = '
|
||||
<h3>'.t("Community Pages").'</h3>
|
||||
<div id="forum-list-right">';
|
||||
|
||||
foreach($contacts as $contact) {
|
||||
$page .= '<div role="menuitem"><a href="' . $a->get_baseurl() . '/redir/' . $contact["id"] . '" title="'.t('External link to forum').'" class="label sparkle" target="_blank"><img class="forumlist-img" height="20" width="20" src="' . $contact['micro'] .'" alt="'.t('External link to forum').'" /></a> <a href="' . $a->get_baseurl() . '/network?f=&cid=' . $contact['id'] . '" >' . $contact["name"]."</a></div>";
|
||||
}
|
||||
|
||||
$page .= '</div>';
|
||||
$aside['$page'] = $page;
|
||||
}
|
||||
}
|
||||
//END Community Page
|
||||
|
||||
//helpers
|
||||
if($show_helpers) {
|
||||
$r = array();
|
||||
|
||||
$helperlist = get_config("vier", "helperlist");
|
||||
|
||||
$helpers = explode(",",$helperlist);
|
||||
|
||||
if ($helpers) {
|
||||
$query = "";
|
||||
foreach ($helpers AS $index=>$helper) {
|
||||
if ($query != "")
|
||||
$query .= ",";
|
||||
|
||||
$query .= "'".dbesc(normalise_link(trim($helper)))."'";
|
||||
}
|
||||
|
||||
$r = q("SELECT `url`, `name` FROM `gcontact` WHERE `nurl` IN (%s)", $query);
|
||||
}
|
||||
|
||||
foreach ($r AS $index => $helper)
|
||||
$r[$index]["url"] = zrl($helper["url"]);
|
||||
|
||||
$r[] = Array("url" => "help/Quick-Start-guide", "name" => t("Quick Start"));
|
||||
|
||||
$tpl = get_markup_template('ch_helpers.tpl');
|
||||
|
||||
if ($r) {
|
||||
|
||||
$helpers = array();
|
||||
$helpers['title'] = Array("", t('Help'), "", "");
|
||||
|
||||
$aside['$helpers_items'] = array();
|
||||
|
||||
foreach($r as $rr) {
|
||||
$entry = replace_macros($tpl,array(
|
||||
'$url' => $rr['url'],
|
||||
'$title' => $rr['name'],
|
||||
));
|
||||
$aside['$helpers_items'][] = $entry;
|
||||
}
|
||||
|
||||
$aside['$helpers'] = $helpers;
|
||||
}
|
||||
}
|
||||
//end helpers
|
||||
|
||||
//connectable services
|
||||
if ($show_services) {
|
||||
|
||||
$r = array();
|
||||
|
||||
if (nodeinfo_plugin_enabled("appnet"))
|
||||
$r[] = array("photo" => "images/appnet.png", "name" => "App.net");
|
||||
|
||||
if (nodeinfo_plugin_enabled("buffer"))
|
||||
$r[] = array("photo" => "images/buffer.png", "name" => "Buffer");
|
||||
|
||||
if (nodeinfo_plugin_enabled("blogger"))
|
||||
$r[] = array("photo" => "images/blogger.png", "name" => "Blogger");
|
||||
|
||||
if (nodeinfo_plugin_enabled("dwpost"))
|
||||
$r[] = array("photo" => "images/dreamwidth.png", "name" => "Dreamwidth");
|
||||
|
||||
if (nodeinfo_plugin_enabled("fbpost"))
|
||||
$r[] = array("photo" => "images/facebook.png", "name" => "Facebook");
|
||||
|
||||
if (nodeinfo_plugin_enabled("statusnet"))
|
||||
$r[] = array("photo" => "images/gnusocial.png", "name" => "GNU Social");
|
||||
|
||||
if (nodeinfo_plugin_enabled("gpluspost"))
|
||||
$r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
|
||||
|
||||
//if (nodeinfo_plugin_enabled("ijpost"))
|
||||
// $r[] = array("photo" => "images/", "name" => "");
|
||||
|
||||
if (nodeinfo_plugin_enabled("libertree"))
|
||||
$r[] = array("photo" => "images/libertree.png", "name" => "Libertree");
|
||||
|
||||
//if (nodeinfo_plugin_enabled("ljpost"))
|
||||
// $r[] = array("photo" => "images/", "name" => "");
|
||||
|
||||
if (nodeinfo_plugin_enabled("pumpio"))
|
||||
$r[] = array("photo" => "images/pumpio.png", "name" => "pump.io");
|
||||
|
||||
if (nodeinfo_plugin_enabled("tumblr"))
|
||||
$r[] = array("photo" => "images/tumblr.png", "name" => "Tumblr");
|
||||
|
||||
if (nodeinfo_plugin_enabled("twitter"))
|
||||
$r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
|
||||
|
||||
if (nodeinfo_plugin_enabled("wppost"))
|
||||
$r[] = array("photo" => "images/wordpress", "name" => "Wordpress");
|
||||
|
||||
if(function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"))
|
||||
$r[] = array("photo" => "images/mail", "name" => "E-Mail");
|
||||
|
||||
$tpl = get_markup_template('ch_connectors.tpl');
|
||||
|
||||
if(count($r)) {
|
||||
|
||||
$con_services = array();
|
||||
$con_services['title'] = Array("", t('Connect Services'), "", "");
|
||||
$aside['$con_services'] = $con_services;
|
||||
|
||||
foreach($r as $rr) {
|
||||
$entry = replace_macros($tpl,array(
|
||||
'$url' => $url,
|
||||
'$photo' => $rr['photo'],
|
||||
'$alt_text' => $rr['name'],
|
||||
));
|
||||
$aside['$connector_items'][] = $entry;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//end connectable services
|
||||
|
||||
//print right_aside
|
||||
$tpl = get_markup_template('communityhome.tpl');
|
||||
$a->page['right_aside'] = replace_macros($tpl, $aside);
|
||||
}
|
||||
|
|
|
|||
50
view/theme/vier/wide.css
Normal file
50
view/theme/vier/wide.css
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
right_aside {
|
||||
vertical-align: top;
|
||||
width: 185px;
|
||||
padding-top: 10px;
|
||||
padding-right: 20px;
|
||||
padding-bottom: 0px;
|
||||
padding-left: 10px;
|
||||
background-color: #FFFFFF;
|
||||
font-size: 13px;
|
||||
overflow-y: auto;
|
||||
z-index: 2;
|
||||
line-height: 17px;
|
||||
color: #737373;
|
||||
top: 44px;
|
||||
position: absolute;
|
||||
/* position: fixed;
|
||||
height: calc(100% - 54px); */
|
||||
display: block;
|
||||
margin-left: calc(100% - 215px);
|
||||
box-shadow: 1px 2px 0px 0px #D8D8D8;
|
||||
}
|
||||
|
||||
#forumlist-sidebar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
right_aside span.sbox {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
right_aside .directory-item {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
}
|
||||
|
||||
right_aside img.directory-photo-img {
|
||||
width: 45px;
|
||||
height: 45px;
|
||||
}
|
||||
|
||||
right_aside #right_services img {
|
||||
width: 34px;
|
||||
}
|
||||
|
||||
right_aside #lastusers-wrapper,
|
||||
right_aside div.itens-wrapper,
|
||||
right_aside #right_services_icons {
|
||||
margin-left: 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue