From 7562f77bdf7040d5cc63473a3c6ff7c499600f13 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 3 Jun 2017 17:23:53 +0200 Subject: rewrite wiki pages widget - no need for ajax on pageload, show the pages to not authenticated people. --- view/tpl/wiki.tpl | 19 ++++++++----------- view/tpl/wiki_page_list.tpl | 16 ++++++++++------ 2 files changed, 18 insertions(+), 17 deletions(-) (limited to 'view') diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 564db3324..7cd3708b8 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -115,7 +115,7 @@ }); $( "#rename-page-form" ).submit(function( event ) { - $.post("wiki/{{$channel}}/rename/page", + $.post("wiki/{{$channel_address}}/rename/page", { oldName: window.wiki_page_name, newName: $('#id_pageRename').val(), @@ -177,7 +177,7 @@ }); $('#wiki-get-preview').click(function (ev) { - $.post("wiki/{{$channel}}/preview", { + $.post("wiki/{{$channel_address}}/preview", { {{if !$mimeType || $mimeType == 'text/markdown'}} content: editor.getValue(), {{else}} @@ -200,7 +200,7 @@ }); $('#wiki-get-history').click(function (ev) { - $.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { + $.post("wiki/{{$channel_address}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { if (data.success) { $('#page-history-list').html(data.historyHTML); $('#page-tools').hide(); @@ -215,10 +215,9 @@ if (window.wiki_resource_id === '') { return false; } - $.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) { + $.post("wiki/{{$channel_address}}/get/page/list/", {channel_id: '{{$channel_id}}', resource_id: window.wiki_resource_id}, function (data) { if (data.success) { - $('#wiki_page_list_container').html(data.pages); - $('#wiki_page_list_container').show(); + $('#wiki_page_list').html(data.pages); } else { alert('Error fetching page list!'); window.console.log('Error fetching page list!'); @@ -245,7 +244,7 @@ ev.preventDefault(); return false; } - $.post("wiki/{{$channel}}/save/page", { + $.post("wiki/{{$channel_address}}/save/page", { content: currentContent, commitMsg: $('#id_commitMsg').val(), name: window.wiki_page_name, @@ -276,7 +275,7 @@ window.console.log('You must have a wiki page open in order to revert pages.'); return false; } - $.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, + $.post("wiki/{{$channel_address}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { if (data.success) { $('button[id^=revert-]').removeClass('btn-success'); @@ -299,7 +298,7 @@ window.console.log('You must have a wiki page open in order to revert pages.'); return false; } - $.post("wiki/{{$channel}}/compare/page", { + $.post("wiki/{{$channel_address}}/compare/page", { compareCommit: compareCommit, currentCommit: window.wiki_page_commit, name: window.wiki_page_name, @@ -442,8 +441,6 @@ }; $(document).ready(function () { - wiki_refresh_page_list(); - {{if !$mimeType || $mimeType == 'text/markdown'}} $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"}); window.editor.on("input", function() { diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index 44fba15cc..6d09fcd5d 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -1,5 +1,6 @@ -{{if $not_refresh}}{{/if}} +{{/if}} +{{if $canadd}} +{{/if}} -- cgit v1.2.3 From e8a4e9a31f57e53e076b440fc3b728044c42adda Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sun, 4 Jun 2017 12:52:52 +0200 Subject: class mixup --- view/tpl/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 39fe686a9..4719e1b17 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -233,7 +233,7 @@ {{if $localuser}}
{{$addapps}} - {{$orderapps}} + {{$orderapps}} {{/if}} -- cgit v1.2.3 From e7c3ca9bd832f83bf2f66d6a06761062f2118185 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sun, 4 Jun 2017 16:39:52 +0200 Subject: fix allow setting a default schema for the hub (issue #797) and allow selecting of focus (hubzilla default) schema if a default is set. --- view/theme/redbasic/php/config.php | 15 +++++++++++++-- view/theme/redbasic/php/style.php | 7 +++---- 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 752a02a6a..8dbe1be9c 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -5,10 +5,20 @@ namespace Zotlabs\Theme; class RedbasicConfig { function get_schemas() { - $scheme_choices = array(); - $scheme_choices["---"] = t("Focus (Hubzilla default)"); $files = glob('view/theme/redbasic/schema/*.php'); + + $scheme_choices = []; + if($files) { + + if(in_array('view/theme/redbasic/schema/default.php', $files)) { + $scheme_choices['---'] = t('Default'); + $scheme_choices['focus'] = t('Focus (Hubzilla default)'); + } + else { + $scheme_choices['---'] = t('Focus (Hubzilla default)'); + } + foreach($files as $file) { $f = basename($file, ".php"); if($f != 'default') { @@ -17,6 +27,7 @@ class RedbasicConfig { } } } + return $scheme_choices; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index a666f96f2..06cf23ba2 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -56,10 +56,9 @@ if (($schema) && ($schema != '---')) { } -// If we haven't got a schema, load the default. We shouldn't touch this - we -// should leave it for admins to define for themselves. -// default.php and default.css MUST be symlinks to existing schema files. -if (! $schema) { +// Allow admins to set a default schema for the hub. +// default.php and default.css MUST be symlinks to existing schema files in view/theme/redbasic/schema +if ((!$schema) || ($schema == '---')) { if(file_exists('view/theme/redbasic/schema/default.php')) { $schemefile = 'view/theme/redbasic/schema/default.php'; -- cgit v1.2.3 From 4784f847c9d752c34ff4eeec8a6c40455fe313ce Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sun, 4 Jun 2017 17:15:33 +0200 Subject: fix nav-tabs for dark scheme --- view/theme/redbasic/schema/dark.css | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index ebef68a52..4154c88fa 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -270,26 +270,20 @@ nav .dropdown-menu { background: #999; } -.nav-tabs{ +.nav-tabs { border-bottom:1px solid #333; } -.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{ - border:1px solid #333; -} - -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { +.nav-tabs .nav-link.active { color: #fff; - background-color: #111; -} - -.nav-tabs.nav-justified > li > a { - color: #ccc; + background-color: #111; + border-color: #333; } -.nav-tabs > li > a:hover, .nav-tabs > li > a:focus { - text-decoration: underline; - background-color: #222; +.nav-tabs .nav-link:hover, +.nav-tabs .nav-link:focus { + text-decoration: underline; + background-color: #222; color: #ccc; border-color: #333; } -- cgit v1.2.3 From 84c04cfe1c2ccb95067bc118a16cd70ce2c6ee05 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 30 May 2017 21:28:59 -0700 Subject: remove text_highlight css load from core --- view/php/theme_init.php | 1 - 1 file changed, 1 deletion(-) (limited to 'view') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 869b97473..ff37023cf 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,7 +10,6 @@ head_add_css('/view/css/conversation.css'); head_add_css('/view/css/widgets.css'); head_add_css('/view/css/colorbox.css'); head_add_css('/library/justifiedGallery/justifiedGallery.min.css'); -head_add_css('/library/Text_Highlighter/sample.css'); head_add_js('jquery.js'); head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js'); -- cgit v1.2.3 From 55836e8ca65ca9a2ae25591de3232470d7a50049 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 7 Jun 2017 22:40:44 +0200 Subject: update bs-dev --- view/css/bootstrap-red.css | 6 ++++++ view/theme/redbasic/php/theme_init.php | 1 + 2 files changed, 7 insertions(+) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 1bb82f11c..b2b2ca759 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -46,6 +46,12 @@ nav .dropdown-menu { overflow: auto; } +/* this is a hack and needs fixing in bootstrap */ +nav .dropdown-menu-right { + right: 0; + left: auto !important; +} + #navbar-collapse-2 { flex-basis: 100%; max-height: 70vh; diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 020bda363..bfeabcb46 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -8,6 +8,7 @@ head_add_css('/library/datetimepicker/jquery.datetimepicker.css'); head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); require_once('view/php/theme_init.php'); +head_add_js('/library/popper/popper.js'); head_add_js('/library/bootstrap/js/bootstrap.min.js'); head_add_js('/library/bootbox/bootbox.min.js'); head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js'); -- cgit v1.2.3