mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-01-17 05:18:19 +01:00
Code Issues Releases Wiki Activity

Fix 1.4.6.1: Editor rights and cyanine styles

Browse Source
This commit is contained in:
trendschau 2021-06-16 22:02:15 +02:00
parent c161f065ef
commit 9a3b839683
6 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/Settings.php
View File

@ -84,7 +84,7 @@ class Settings
'editor' => 'visual',
'formats' => ['markdown', 'headline', 'ulist', 'olist', 'table', 'quote', 'notice', 'image', 'video', 'file', 'toc', 'hr', 'definition', 'code'],
'contentFolder' => 'content',
'version' => '1.4.6',
'version' => '1.4.6.1',
'setup' => true,
'welcome' => true,
'images' => ['live' => ['width' => 820], 'thumbs' => ['width' => 250, 'height' => 150]],

2
system/author/editor/editor-blox.twig
View File

@ -66,7 +66,7 @@
</draggable>
</div>
{% if (acl.isAllowed(get_role(), 'content', 'edit')) or ( (mycontent) and (acl.isAllowed(get_role(), 'mycontent', 'update')) ) %}
{% if (acl.isAllowed(get_role(), 'content', 'update')) or ( (mycontent) and (acl.isAllowed(get_role(), 'mycontent', 'update')) ) %}
<div class="format-bar">

8
themes/cyanine/css/style.css
View File

@ -512,7 +512,7 @@ button.play-video::after {
}
@media print {
#contentnav, #bottompager{
#contentnav, #bottompager,.widgetcontainer,.funcicons,.account,footer{
display: none;
}
.grid-main{
@ -526,9 +526,9 @@ button.play-video::after {
font-size: 14px;
font-weight: normal;
}
body{
// padding: 3rem 3rem 3rem 5rem!important;
}
.logo-image{
max-width: 200px;
}
main{
padding-bottom: 0!important;
}

2
themes/cyanine/cyanine.yaml
View File

@ -1,5 +1,5 @@
name: Cyanine Theme
version: 1.1.4
version: 1.1.5
description: Cyanine is a modern and flexible multi-purpose theme and the standard theme for typemill.
author: Trendschau
homepage: https://trendschau.net

18
themes/cyanine/page.twig
View File

@ -23,11 +23,13 @@
</header>
{% if widgets %}
<div class="widgetcontainer">
{% for index,widget in widgets %}
<div id="{{ index }}" class="mt4-l mt3">
{{ widget }}
</div>
{% endfor %}
</div>
{% endif %}
</aside>
@ -53,12 +55,14 @@
<adress class="pr2">{{ settings.themes.cyanine.authorIntro }} {{ metatabs.meta.author|default(settings.author) }}</adress>
{% endif %}
</div>
{% if settings.themes.cyanine.gitPosition.top %}
<a class="link" title="edit on github" href="{{ settings.themes.cyanine.gitLink }}{{ item.path }}">{% if settings.themes.cyanine.editIcon %}<svg class="icon baseline icon-edit"><use xlink:href="#icon-edit"></use></svg>{% else %}{{ settings.themes.cyanine.editText }}{% endif %}</a>
{% endif %}
{% if settings.themes.cyanine.printPosition.top %}
<a class="link" title="open printer dialogue" href="#" onclick="if (window.print) {window.print();}">{% if settings.themes.cyanine.printIcon %}<svg class="icon baseline icon-printer"><use xlink:href="#icon-printer"></use></svg>{% else %}{{ settings.themes.cyanine.printText }}{% endif %}</a>
{% endif %}
<div class="funcicons">
{% if settings.themes.cyanine.gitPosition.top %}
<a class="link" title="edit on github" href="{{ settings.themes.cyanine.gitLink }}{{ item.path }}">{% if settings.themes.cyanine.editIcon %}<svg class="icon baseline icon-edit"><use xlink:href="#icon-edit"></use></svg>{% else %}{{ settings.themes.cyanine.editText }}{% endif %}</a>
{% endif %}
{% if settings.themes.cyanine.printPosition.top %}
<a class="link" title="open printer dialogue" href="#" onclick="if (window.print) {window.print();}">{% if settings.themes.cyanine.printIcon %}<svg class="icon baseline icon-printer"><use xlink:href="#icon-printer"></use></svg>{% else %}{{ settings.themes.cyanine.printText }}{% endif %}</a>
{% endif %}
</div>
</div>
{% endif %}
</header>
@ -75,12 +79,14 @@
<adress class="pr2">{{ settings.themes.cyanine.authorIntro }} {{ metatabs.meta.author|default(settings.author) }}</adress>
{% endif %}
</div>
<div class="funcicons">
{% if settings.themes.cyanine.gitPosition.bottom %}
<a class="link" title="edit on github" href="{{ settings.themes.cyanine.gitLink }}{{ item.path }}">{% if settings.themes.cyanine.editIcon %}<svg class="icon baseline icon-edit"><use xlink:href="#icon-edit"></use></svg>{% else %}{{ settings.themes.cyanine.editText }}{% endif %}</a>
{% endif %}
{% if settings.themes.cyanine.printPosition.bottom %}
<a class="link" title="open printer dialogue" href="#" onclick="if (window.print) {window.print();}">{% if settings.themes.cyanine.printIcon %}<svg class="icon baseline icon-printer"><use xlink:href="#icon-printer"></use></svg>{% else %}{{ settings.themes.cyanine.printText }}{% endif %}</a>
{% endif %}
</div>
</div>
{% endif %}

6
themes/cyanine/partials/breadcrumb.twig
View File

@ -1,14 +1,14 @@
<div class="f6 pv3 w-100 flex-l justify-between">
<div class="mw6">
<a class="link f-link underline-hover" href="{{ base_url }}">{{ settings.title|title }}</a>
<a class="link f-link underline-hover" href="{{ base_url }}">{{ settings.title }}</a>
{% for crumb in breadcrumb %}
&nbsp; &#x203A; &nbsp;
{% if loop.last %}
{{ crumb.name|title }}
{{ crumb.name }}
{% else %}
<a class="link f-link underline-hover" href="{{ crumb.urlRel }}">{{ crumb.name|title }}</a>
<a class="link f-link underline-hover" href="{{ crumb.urlRel }}">{{ crumb.name }}</a>
{% endif %}
{% endfor %}
</div>