LoweBowe/zira
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

minor fixes

Browse source
This commit is contained in:
Dro1d.Ru 2017-10-05 19:47:40 +05:00
parent f2847cf994
commit 247b151ee0
6 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
assets/css/forum/forum.css
View file

@ -71,6 +71,10 @@
.forum-list.list .list-item.odd-b {
background-color: #fdfdfd;
}
.forum-list.list .list-item .list-title-wrapper {
position: relative;
padding: 10px 110px 10px 14px;
}
.forum-list.list .list-item a.list-title:link,
.forum-list.list .list-item a.list-title:visited,
.forum-list.list .list-item .list-title-wrapper a:link,
@ -82,7 +86,8 @@
color: #4573A1;
}
.forum-list.list .list-item .list-title-wrapper .forum-right-item {
float: right;
position: absolute;
right: 14px;
font-size: 16px;
margin-top: 3px;
}
@ -222,4 +227,25 @@
.forum-empty-message {
margin: 40px 0px;
font-style: italic;
}
@media (max-width: 639px) {
.forum-message-wrapper .forum-avatar-wrapper {
min-width: 40px;
padding: 0px;
border-radius: 20px;
}
.forum-message-wrapper .forum-avatar-wrapper img {
max-width: 40px;
border-radius: 20px;
}
.forum-user-info {
display: none;
}
.forum-message-wrapper .forum-message {
margin-left: 60px;
}
.forum-list.list .list-item .forum-message-attaches {
margin-left: 70px;
}
}

2
assets/js/dash/editor.js
View file

@ -99,7 +99,7 @@ var dash_editor_html_load = function() {
tinymce.init({
selector:'#'+$(this.content).find('.editable').attr('id') ,
plugins: 'paste, advlist, link, image, media, table, hr, pagebreak, code, contextmenu, textcolor',
toolbar: ['desk_save | undo redo | table | bullist numlist | desk_file_selector image media link | outdent indent | hr pagebreak | code', 'styleselect | bold italic underline forecolor removeformat | aligncenter alignleft alignright alignjustify '],
toolbar: ['desk_save | undo redo | table | bullist numlist | desk_file_selector image media link | outdent indent | hr pagebreak | code', 'styleselect | bold italic underline | forecolor backcolor | removeformat | aligncenter alignleft alignright alignjustify '],
menubar: false,
language: dash_editor_language,
paste_word_valid_elements: 'b,strong,i,em,h1,h2,h3,h4,h5,h6,p,ul,ol,li,hr,br,table,tr,td',

6
install/environment.php
View file

@ -98,9 +98,9 @@ $response = array('content'=>Zira\Helper::tag('style', '.system-ok { color: gree
(!$htaccess_exists || !$robots_exists || !$config_exists ?
Zira\Helper::tag('p', Zira\Locale::t('You have to rename the following files:')).
Zira\Helper::tag_open('ul').
Zira\Helper::tag('li', 'htaccess.txt ⇨ .htaccess').
Zira\Helper::tag('li', 'robots.src.txt ⇨ robots.txt').
Zira\Helper::tag('li', 'config.src.php ⇨ config.php').
(!$htaccess_exists ? Zira\Helper::tag('li', 'htaccess.txt ⇨ .htaccess') : '').
(!$robots_exists ? Zira\Helper::tag('li', 'robots.src.txt ⇨ robots.txt') : '').
(!$config_exists ? Zira\Helper::tag('li', 'config.src.php ⇨ config.php') : '').
Zira\Helper::tag_close('ul').
Zira\Helper::tag_open('p').' '.Zira\Helper::tag_close('p')
: '').

4
themes/default/forum/thread.php
View file

@ -15,7 +15,7 @@
<div class="collapse navbar-collapse" id="user-messages-panel">
<?php if (isset($searchForm)) echo $searchForm; ?>
<?php if (isset($form) && !empty($topic_active)): ?>
<button class="btn btn-default navbar-btn navbar-right reply-btn scroll-down" data-target=".form-panel"><span class="glyphicon glyphicon-pencil"></span> <?php echo t('Reply') ?></button>
<button class="btn btn-default navbar-btn navbar-right reply-btn scroll-down" data-target=".form-panel"><span class="glyphicon glyphicon-share-alt"></span> <?php echo t('Reply') ?></button>
<?php endif; ?>
<?php if (isset($form) && empty($topic_active)): ?>
<button class="btn btn-default navbar-btn navbar-right disabled" title="<?php echo tm('Thread is closed','forum') ?>"><span class="glyphicon glyphicon-lock"></span></button>
@ -32,7 +32,7 @@
<li id="forum-message-<?php echo Zira\Helper::html($item->id); ?>" class="list-item no-thumb <?php echo ($co%2==0 ? 'odd' : 'even') ?>">
<h3 class="list-title-wrapper">
<?php if (isset($form) && !empty($topic_active)): ?>
<a href="javascript:void(0)" class="forum-reply-inline forum-right-item"><span class="glyphicon glyphicon-pencil"></span> <?php echo tm('Reply', 'forum') ?></a>
<a href="javascript:void(0)" class="forum-reply-inline forum-right-item"><span class="glyphicon glyphicon-share-alt"></span> <?php echo tm('Reply', 'forum') ?></a>
<?php endif; ?>
<?php if ($item->user_username): ?>
<?php echo Zira\User::generateUserProfileLink($item->creator_id, $item->user_firstname, $item->user_secondname, $item->user_username, 'author') ?>

2
themes/default/forum/user.php
View file

@ -114,5 +114,5 @@
</ul>
<?php if (isset($pagination)) echo $pagination; ?>
<?php else: ?>
<p><?php echo tm('No posts found', 'forum') ?></p>
<p class="list"><?php echo tm('No posts found', 'forum') ?></p>
<?php endif; ?>

2
zira/locale.php
View file

@ -31,7 +31,7 @@ class Locale {
} else {
$locale = self::detect();
}
if ($locale!=Config::get('language')) {
if ($locale && $locale!=Config::get('language')) {
Helper::setAddingLanguageToUrl(false);
Response::redirect($locale);
}