harukin/theme
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
fix notification's time issue and some pdl

See merge request harukin/hubzillatheme!16
This commit is contained in:
harukin 2018-12-31 12:08:00 +09:00
commit cc694b172d
5 changed files with 1174 additions and 1112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2158
view/theme/plusfuture/css/style.css
View File

File diff suppressed because it is too large Load Diff

5
view/theme/plusfuture/pdl/mod_wiki.pdl
View File

@ -1,7 +1,5 @@
[region=aside]
[widget=userlogomenu][/widget]
[widget=wiki_pages][/widget]
[widget=notifications][/widget]
[/region]
[region=content]
@ -10,5 +8,6 @@ $content
[/region]
[region=right_aside]
[widget=shortprofile][var=scale]2[/var][/widget]
[widget=notifications][/widget]
[widget=wiki_pages][/widget]
[/region]

108
view/theme/plusfuture/php/config.php
View File

@ -2,26 +2,27 @@
namespace Zotlabs\Theme;
class plusfutureConfig {
class plusfutureConfig
{
function get_schemas() {
function get_schemas()
{
$files = glob('view/theme/plusfuture/schema/*.php');
$scheme_choices = [];
if($files) {
if ($files) {
if(in_array('view/theme/plusfuture/schema/default.php', $files)) {
if (in_array('view/theme/plusfuture/schema/default.php', $files)) {
$scheme_choices['---'] = t('Default');
$scheme_choices['focus'] = t('Focus (Hubzilla default)');
}
else {
} else {
$scheme_choices['---'] = t('Focus (Hubzilla default)');
}
foreach($files as $file) {
foreach ($files as $file) {
$f = basename($file, ".php");
if($f != 'default') {
if ($f != 'default') {
$scheme_name = $f;
$scheme_choices[$f] = $scheme_name;
}
@ -31,36 +32,38 @@ class plusfutureConfig {
return $scheme_choices;
}
function get() {
if(! local_channel()) {
function get()
{
if (!local_channel()) {
return;
}
$arr = array();
$arr['narrow_navbar'] = get_pconfig(local_channel(),'plusfuture', 'narrow_navbar' );
$arr['singlepost'] = get_pconfig(local_channel(),'plusfuture', 'singlepost' );
$arr['nav_bg'] = get_pconfig(local_channel(),'plusfuture', 'nav_bg' );
$arr['nav_icon_colour'] = get_pconfig(local_channel(),'plusfuture', 'nav_icon_colour' );
$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'plusfuture', 'nav_active_icon_colour' );
$arr['link_colour'] = get_pconfig(local_channel(),'plusfuture', 'link_colour' );
$arr['banner_colour'] = get_pconfig(local_channel(),'plusfuture', 'banner_colour' );
$arr['bgcolour'] = get_pconfig(local_channel(),'plusfuture', 'background_colour' );
$arr['background_image'] = get_pconfig(local_channel(),'plusfuture', 'background_image' );
$arr['item_colour'] = get_pconfig(local_channel(),'plusfuture', 'item_colour' );
$arr['comment_item_colour'] = get_pconfig(local_channel(),'plusfuture', 'comment_item_colour' );
$arr['font_size'] = get_pconfig(local_channel(),'plusfuture', 'font_size' );
$arr['font_colour'] = get_pconfig(local_channel(),'plusfuture', 'font_colour' );
$arr['radius'] = get_pconfig(local_channel(),'plusfuture', 'radius' );
$arr['shadow'] = get_pconfig(local_channel(),'plusfuture', 'photo_shadow' );
$arr['converse_width']=get_pconfig(local_channel(),"plusfuture","converse_width");
$arr['top_photo']=get_pconfig(local_channel(),"plusfuture","top_photo");
$arr['reply_photo']=get_pconfig(local_channel(),"plusfuture","reply_photo");
$arr['narrow_navbar'] = get_pconfig(local_channel(), 'plusfuture', 'narrow_navbar');
$arr['singlepost'] = get_pconfig(local_channel(), 'plusfuture', 'singlepost');
$arr['nav_bg'] = get_pconfig(local_channel(), 'plusfuture', 'nav_bg');
$arr['nav_icon_colour'] = get_pconfig(local_channel(), 'plusfuture', 'nav_icon_colour');
$arr['nav_active_icon_colour'] = get_pconfig(local_channel(), 'plusfuture', 'nav_active_icon_colour');
$arr['link_colour'] = get_pconfig(local_channel(), 'plusfuture', 'link_colour');
$arr['banner_colour'] = get_pconfig(local_channel(), 'plusfuture', 'banner_colour');
$arr['bgcolour'] = get_pconfig(local_channel(), 'plusfuture', 'background_colour');
$arr['background_image'] = get_pconfig(local_channel(), 'plusfuture', 'background_image');
$arr['item_colour'] = get_pconfig(local_channel(), 'plusfuture', 'item_colour');
$arr['comment_item_colour'] = get_pconfig(local_channel(), 'plusfuture', 'comment_item_colour');
$arr['font_size'] = get_pconfig(local_channel(), 'plusfuture', 'font_size');
$arr['font_colour'] = get_pconfig(local_channel(), 'plusfuture', 'font_colour');
$arr['radius'] = get_pconfig(local_channel(), 'plusfuture', 'radius');
$arr['shadow'] = get_pconfig(local_channel(), 'plusfuture', 'photo_shadow');
$arr['converse_width'] = get_pconfig(local_channel(), "plusfuture", "converse_width");
$arr['top_photo'] = get_pconfig(local_channel(), "plusfuture", "top_photo");
$arr['reply_photo'] = get_pconfig(local_channel(), "plusfuture", "reply_photo");
$arr['advanced_theming'] = get_pconfig(local_channel(), 'plusfuture', 'advanced_theming');
return $this->form($arr);
}
function post() {
if(!local_channel()) {
function post()
{
if (!local_channel()) {
return;
}
@ -87,37 +90,38 @@ class plusfutureConfig {
}
}
function form($arr) {
function form($arr)
{
if(get_pconfig(local_channel(), 'plusfuture', 'advanced_theming'))
if (get_pconfig(local_channel(), 'plusfuture', 'advanced_theming'))
$expert = 1;
$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
'$submit' => t('Submit'),
'$baseurl' => z_root(),
'$theme' => \App::$channel['channel_theme'],
'$expert' => $expert,
'$title' => t("Theme settings"),
'$narrow_navbar' => array('plusfuture_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
'$singlepost' => array('plusfuture_singlepost',t('Singlepost'),$arr['singlepost'], '', array(t('No'),t('Yes'))),
'$nav_bg' => array('plusfuture_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
'$nav_icon_colour' => array('plusfuture_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
'$nav_active_icon_colour' => array('plusfuture_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
'$link_colour' => array('plusfuture_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('plusfuture_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
'$bgcolour' => array('plusfuture_background_colour', t('Set the background color'), $arr['bgcolour']),
'$background_image' => array('plusfuture_background_image', t('Set the background image'), $arr['background_image']),
'$item_colour' => array('plusfuture_item_colour', t('Set the background color of items'), $arr['item_colour']),
'$comment_item_colour' => array('plusfuture_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
'$font_size' => array('plusfuture_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
'$font_colour' => array('plusfuture_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('plusfuture_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
'$shadow' => array('plusfuture_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('plusfuture_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
'$narrow_navbar' => array('plusfuture_narrow_navbar', t('細めのナビバー'), $arr['narrow_navbar'], '', array(t('No'), t('Yes'))),
'$singlepost' => array('plusfuture_singlepost', t('Singlepost'), $arr['singlepost'], '', array(t('No'), t('Yes'))),
'$nav_bg' => array('plusfuture_nav_bg', t('ナビゲーションバーバックグラウンドカラー'), $arr['nav_bg']),
'$nav_icon_colour' => array('plusfuture_nav_icon_colour', t('ナビゲーションバーアイコンカラー'), $arr['nav_icon_colour']),
'$nav_active_icon_colour' => array('plusfuture_nav_active_icon_colour', t('ナビゲーションバーアクティブアイコンカラー'), $arr['nav_active_icon_colour']),
'$link_colour' => array('plusfuture_link_colour', t('リンクカラー'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('plusfuture_banner_colour', t('バナーのフォントカラー'), $arr['banner_colour']),
'$bgcolour' => array('plusfuture_background_colour', t('バックグラウンドカラー'), $arr['bgcolour']),
'$background_image' => array('plusfuture_background_image', t('バックグラウンド画像'), $arr['background_image']),
'$item_colour' => array('plusfuture_item_colour', t('バックグラウンドの画像や色を指定してください。'), $arr['item_colour']),
'$comment_item_colour' => array('plusfuture_comment_item_colour', t('コメント欄のアイテムカラー'), $arr['comment_item_colour']),
'$font_size' => array('plusfuture_font_size', t('フォントサイズ'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
'$font_colour' => array('plusfuture_font_colour', t('投稿とコメントのフォントサイズ'), $arr['font_colour']),
'$radius' => array('plusfuture_radius', t('カードの角丸'), $arr['radius'], t('Example: 4px')),
'$shadow' => array('plusfuture_shadow', t('影'), $arr['shadow']),
'$converse_width' => array('plusfuture_converse_width', t('コンテンツの幅指定'), $arr['converse_width'], t('Leave empty for default width')),
'$top_photo' => array('plusfuture_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
'$reply_photo' => array('plusfuture_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
'$advanced_theming' => ['plusfuture_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
));
'$advanced_theming' => ['plusfuture_advanced_theming', t('詳細設定を開く'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
));
return $o;
}

13
view/theme/plusfuture/tpl/notifications_widget.tpl
View File

@ -90,8 +90,9 @@
$("#nav-{{$notification.type}}-menu .notification").each(function(i, el){
var cn = $(el).data('contact_name').toString().toLowerCase();
var ca = $(el).data('contact_addr').toString().toLowerCase();
if(cn.indexOf(val) === -1)
if(cn.indexOf(val) === -1 && ca.indexOf(val) === -1)
$(this).addClass('d-none');
else
$(this).removeClass('d-none');
@ -119,18 +120,18 @@
{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
</div>
<div id="nav-notifications-template" rel="template">
<a class="list-group-item clearfix notification {5}" href="{0}" title="{2}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
<a class="list-group-item clearfix notification {6}" href="{0}" title="{3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}">
<img class="menu-img-3" data-src="{1}">
<span class="contactname">{2}</span>
<span class="dropdown-sub-text">{3}<br>{4}</span>
<span class="dropdown-sub-text">{4}<br>{5}</span>
</a>
</div>
<div id="nav-notifications-forums-template" rel="template">
<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
<span class="float-right badge badge-{{$notification.severity}}">{9}</span>
<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}">
<span class="float-right badge badge-{{$notification.severity}}">{10}</span>
<img class="menu-img-1" data-src="{1}">
<span class="">{2}</span>
<i class="fa fa-{10} text-muted"></i>
<i class="fa fa-{11} text-muted"></i>
</a>
</div>
<div id="notifications" class="navbar-nav">

2
view/theme/plusfuture/tpl/userlogomenu.tpl
View File

@ -67,7 +67,7 @@
<p>利用規約</p>
</a>
</li>
<iframe id="frame" width="115%" height="120%" src="https://plus.haruk.in/page/harukin/noti" frameborder="0"></iframe>
<iframe id="frame" width="115%" height="120%" src="./page/harukin/noti" frameborder="0"></iframe>
<script>
$(function(){
$('#frame').on('load', function(){