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-11-15 21:02:47 +05:00
parent 8fac7499b7
commit 987f2d8c62
8 changed files with 168 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
assets/js/dash/modules.js
View file

@ -33,14 +33,22 @@ var dash_modules_close = function() {
var dash_modules_activate = function() {
var selected = desk_window_selected(this);
if (selected && typeof(selected.items)!="undefined" && selected.items.length==1) {
desk_window_request(this, url('dash/system/module'),{'module':selected.items[0], 'active': 1});
desk_window_request(this, url('dash/system/module'),{'module':selected.items[0], 'active': 1}, function(){
desk_confirm(t('Page reload required. Reload now ?'), function(){
window.location.reload();
});
});
}
};
var dash_modules_deactivate = function() {
var selected = desk_window_selected(this);
if (selected && typeof(selected.items)!="undefined" && selected.items.length==1) {
desk_window_request(this, url('dash/system/module'),{'module':selected.items[0], 'active': 0});
desk_window_request(this, url('dash/system/module'),{'module':selected.items[0], 'active': 0}, function(){
desk_confirm(t('Page reload required. Reload now ?'), function(){
window.location.reload();
});
});
}
};

49
assets/js/designer/editor.js
View file

@ -1152,6 +1152,7 @@
setColorStyle('.emoji-editable', color);
setColorStyle('#main-container .input-group-addon', color);
setColorStyle('#main-container .input-group-addon a', color);
setColorStyle('.jumbotron', hexColor(color));
});
// forms background
@ -1402,7 +1403,7 @@
}
// container
if ($('.container').length>0) {
if (typeof(designer_style_is_main)!="undefined" && designer_style_is_main && $('.container').length>0) {
if (!isWideContainer()) {
$('body').append('<a href="javascript:void(0)" class="designer_radio_btn designer_radio_container" id="container-designer-radio-btn" title="'+t('Set wide container')+'" data-placement="left"><span class="glyphicon glyphicon-unchecked"></span></a>');
} else {
@ -1436,7 +1437,7 @@
}
// cols
if ($('.col-sm-4').length>0) {
if (typeof(designer_style_is_main)!="undefined" && designer_style_is_main && $('.col-sm-4').length>0) {
if (!isWideCols()) {
$('body').append('<a href="javascript:void(0)" class="designer_radio_btn designer_radio_cols" id="cols-designer-radio-btn" title="'+t('Set wide column')+'" data-placement="left"><span class="glyphicon glyphicon-unchecked"></span></a>');
} else {
@ -1472,30 +1473,32 @@
}
// html
if ($('body').height() != $(window).height()) {
$('body').append('<a href="javascript:void(0)" class="designer_radio_btn designer_radio_html" id="html-designer-radio-btn" title="'+t('Set body height = 100%')+'" data-placement="left"><span class="glyphicon glyphicon-unchecked"></span></a>');
} else {
$('body').append('<a href="javascript:void(0)" class="designer_radio_btn designer_radio_html" id="html-designer-radio-btn" title="'+t('Set body height = auto')+'" data-placement="left"><span class="glyphicon glyphicon-check"></span></a>');
}
designer_positions['html_height'] = function() {
var html_height_x = $(window).width()-1.75*radiobtn_size;
var html_height_y = $(window).height()-3*radiobtn_size;
$('#html-designer-radio-btn').css({'left':html_height_x,'top':html_height_y});
};
$('#html-designer-radio-btn').tooltip();
$('#html-designer-radio-btn').click(function(){
if (typeof(designer_style_is_main)!="undefined" && designer_style_is_main) {
if ($('body').height() != $(window).height()) {
$('html,body').css('height','100%');
setHeightStyle('html,body','100%');
$(this).children('.glyphicon').removeClass('glyphicon-unchecked').addClass('glyphicon-check');
$(this).attr('title', t('Set body height = auto')).tooltip('fixTitle').tooltip('hide');
$('body').append('<a href="javascript:void(0)" class="designer_radio_btn designer_radio_html" id="html-designer-radio-btn" title="'+t('Set body height = 100%')+'" data-placement="left"><span class="glyphicon glyphicon-unchecked"></span></a>');
} else {
$('html,body').css('height','auto');
removeHeightStyle('html,body');
$(this).children('.glyphicon').removeClass('glyphicon-check').addClass('glyphicon-unchecked');
$(this).attr('title', t('Set body height = 100%')).tooltip('fixTitle').tooltip('hide');
$('body').append('<a href="javascript:void(0)" class="designer_radio_btn designer_radio_html" id="html-designer-radio-btn" title="'+t('Set body height = auto')+'" data-placement="left"><span class="glyphicon glyphicon-check"></span></a>');
}
});
designer_positions['html_height'] = function() {
var html_height_x = $(window).width()-1.75*radiobtn_size;
var html_height_y = $(window).height()-3*radiobtn_size;
$('#html-designer-radio-btn').css({'left':html_height_x,'top':html_height_y});
};
$('#html-designer-radio-btn').tooltip();
$('#html-designer-radio-btn').click(function(){
if ($('body').height() != $(window).height()) {
$('html,body').css('height','100%');
setHeightStyle('html,body','100%');
$(this).children('.glyphicon').removeClass('glyphicon-unchecked').addClass('glyphicon-check');
$(this).attr('title', t('Set body height = auto')).tooltip('fixTitle').tooltip('hide');
} else {
$('html,body').css('height','auto');
removeHeightStyle('html,body');
$(this).children('.glyphicon').removeClass('glyphicon-check').addClass('glyphicon-unchecked');
$(this).attr('title', t('Set body height = 100%')).tooltip('fixTitle').tooltip('hide');
}
});
}
$(designer_selectors).css('display', 'block');
$(window).trigger('resize');

13
designer/controllers/dash.php
View file

@ -31,6 +31,14 @@ class Dash extends \Dash\Controller {
Zira\View::setAjax(false);
Zira\View::setRenderDbWidgets(false);
Zira\Assets::setActive(false);
if (!$style->main) {
$link = Zira\Helper::tag_short('link', array(
'rel' => 'stylesheet',
'type' => 'text/css',
'href' => Zira\Helper::url('style')
));
Zira\View::addHtml($link, Zira\View::VAR_HEAD_BOTTOM);
}
$block = new Zira\Widgets\Block();
$block->setCaching(false);
@ -69,6 +77,11 @@ class Dash extends \Dash\Controller {
$css .= Zira\Helper::tag_close('style');
Zira\View::addHTML($css, Zira\View::VAR_HEAD_BOTTOM);
$script = Zira\Helper::tag_open('script', array('type'=>'text/javascript'));
$script .= 'designer_style_is_main = '.($style->main ? 'true' : 'false').';';
$script .= Zira\Helper::tag_close('script');
Zira\View::addHTML($script, Zira\View::VAR_HEAD_BOTTOM);
Zira\Router::setModule(DEFAULT_MODULE);
Zira\Router::setController(DEFAULT_CONTROLLER);
Zira\Router::setAction(DEFAULT_ACTION);

1
designer/designer.php
View file

@ -27,6 +27,7 @@ class Designer {
public function beforeDispatch() {
Zira\Router::addRoute('style','designer/index/index');
Zira\Router::addAllLanguagesRoute('style');
}
public function bootstrap() {

3
languages/ru/dash.js.php
View file

@ -27,5 +27,6 @@ return array(
'Maximum files count per upload:' => 'Максимальное число файлов для загрузки:',
'Sorry, but it seems that your browser is not supported.' => 'Извините, но похоже, ваш браузер не поддерживается.',
'Author' => 'Автор',
'Minimize all' => 'Свернуть всё'
'Minimize all' => 'Свернуть всё',
'Page reload required. Reload now ?' => 'Нужно перезагрузить страницу. Перезагрузить сейчас ?'
);

208
themes/default/designer/page.php
View file

@ -1,107 +1,3 @@
<!--record page-->
<main>
<article>
<div class="page-header">
<h1>Lorem ipsum dolor sit amet</h1>
</div>
<div class="article-info">
<div class="datetime">
<?php echo t('Last updated').': ' ?>
<time datetime="<?php echo date(DATE_W3C, time()) ?>" itemprop="dateModified"><?php echo date(Zira\Config::get('date_format'), time()) ?></time>
</div>
<div class="author">
<?php echo t('Author').': ' ?>
<?php echo Zira\Helper::tag('a', Zira\User::getProfileName(), array('href'=>Zira\Helper::url('user/'.Zira\User::getCurrent()->id))); ?>
</div>
</div>
<div class="article">
<p><a href="<?php echo Zira\Helper::url(''); ?>">Lorem ipsum</a> dolor sit amet, consectetur adipiscing elit. Etiam tempus nec eros in auctor. Fusce porttitor elementum enim, eu commodo tortor laoreet ac. Proin sed efficitur urna. Praesent non ex efficitur, accumsan diam id, mattis ipsum. Proin eget arcu sapien. Nulla pretium blandit rhoncus. Aenean mollis odio id ante imperdiet venenatis. Maecenas sed pulvinar est.</p>
<p>Donec laoreet lobortis tellus. Nullam iaculis in lacus non eleifend. Duis imperdiet odio eget nibh pulvinar eleifend vitae vitae tortor. Praesent ullamcorper lorem quis dictum blandit. Nulla id facilisis nunc, ut tempus neque. Aenean aliquet neque lorem, sit amet porttitor libero tincidunt id. Nulla ac orci eu sem dictum tincidunt. Phasellus volutpat odio et nunc porta, eget cursus odio viverra.</p>
</div>
<div id="rating" class="rating">
<a href="javascript:void(0)" class="like">
<span class="glyphicon glyphicon-thumbs-up"></span> <span class="rating-value">5</span>
</a>
</div>
</article>
</main>
<!--gallery-->
<div class="gallery-wrapper">
<h2><?php echo t('Gallery') ?></h2>
<ul class="gallery">
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
</ul>
</div>
<!--files-->
<div class="files-wrapper">
<ul class="files">
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 1 kB</li>
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 2 kB</li>
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 3 kB</li>
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 4 kB</li>
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 5 kB</li>
</ul>
</div>
<!--messages-->
<div class="alert alert-warning" role="alert"><a href="<?php echo Zira\Helper::url('') ?>">Lorem ipsum</a> dolor sit amet, consectetur adipiscing elit. Etiam tempus nec eros in auctor.</div>
<div class="alert alert-danger" role="alert"><a href="<?php echo Zira\Helper::url('') ?>">Lorem ipsum</a> dolor sit amet, consectetur adipiscing elit. Etiam tempus nec eros in auctor.</div>
<!--comments-->
<div class="comments-wrapper">
<div class="btn-group comment-btn-group" role="group">
<button class="btn btn-primary comment-btn scroll-down" data-target="#comments-form"><?php echo t('Leave a comment') ?></button>
<button class="btn btn-default comments-reload" type="button"><span class="glyphicon glyphicon-refresh"></span></button>
</div>
<h2 id="comments"><?php echo t('Comments') ?>(99)</h2>
<ul class="comments">
<li class="comments-item">
<?php echo Zira\User::generateUserProfileThumb(null, null, array('class'=>'comment-avatar')) ?>
<span class="comment-head">
<a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('Guest') ?></a></span>
<p class="comment-text parse-content parsed-content emoji-parsed-content">Lorem ipsum dolor sit amet</p>
<span class="comment-info">
<span class="glyphicon glyphicon-time"></span> <?php echo date(Zira\Config::get('date_format'), time()) ?> &nbsp;
<a href="javascript:void(0)" class="comment-rating comment-like">
<span class="glyphicon glyphicon-thumbs-up"></span>
<span class="rating-value">0</span>
</a> &nbsp;
<a href="javascript:void(0)" class="comment-rating comment-dislike">
<span class="glyphicon glyphicon-thumbs-down"></span>
<span class="rating-value">0</span>
</a> &nbsp;
</span>
</li>
<li class="comments-item comments-item-nested-1">
<?php echo Zira\User::generateUserProfileThumb(null, null, array('class'=>'comment-avatar')) ?>
<span class="comment-head">
<a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('Guest') ?></a></span>
<p class="comment-text parse-content parsed-content emoji-parsed-content">Lorem ipsum dolor sit amet</p>
<span class="comment-info">
<span class="glyphicon glyphicon-time"></span> <?php echo date(Zira\Config::get('date_format'), time()) ?> &nbsp;
<a href="javascript:void(0)" class="comment-rating comment-like">
<span class="glyphicon glyphicon-thumbs-up"></span>
<span class="rating-value">0</span>
</a> &nbsp;
<a href="javascript:void(0)" class="comment-rating comment-dislike">
<span class="glyphicon glyphicon-thumbs-down"></span>
<span class="rating-value">0</span>
</a> &nbsp;
</span>
</li>
</ul>
<div class="comments-view-more-wrapper">
<button class="btn btn-primary comments-view-more" type="button" ><?php echo t('View more') ?>&nbsp;&rsaquo;&rsaquo;</button>
</div>
<div id="comments-form" class="comment-form-wrapper">
<?php echo new Zira\Forms\Comment(); ?>
</div>
</div>
<!--home page-->
<div class="home-category-wrapper grid-category-wrapper">
<div class="page-header">
@ -238,3 +134,107 @@
</nav>
</div>
</div>
<!--record page-->
<main>
<article>
<div class="page-header">
<h1>Lorem ipsum dolor sit amet</h1>
</div>
<div class="article-info">
<div class="datetime">
<?php echo t('Last updated').': ' ?>
<time datetime="<?php echo date(DATE_W3C, time()) ?>" itemprop="dateModified"><?php echo date(Zira\Config::get('date_format'), time()) ?></time>
</div>
<div class="author">
<?php echo t('Author').': ' ?>
<?php echo Zira\Helper::tag('a', Zira\User::getProfileName(), array('href'=>Zira\Helper::url('user/'.Zira\User::getCurrent()->id))); ?>
</div>
</div>
<div class="article">
<p><a href="<?php echo Zira\Helper::url(''); ?>">Lorem ipsum</a> dolor sit amet, consectetur adipiscing elit. Etiam tempus nec eros in auctor. Fusce porttitor elementum enim, eu commodo tortor laoreet ac. Proin sed efficitur urna. Praesent non ex efficitur, accumsan diam id, mattis ipsum. Proin eget arcu sapien. Nulla pretium blandit rhoncus. Aenean mollis odio id ante imperdiet venenatis. Maecenas sed pulvinar est.</p>
<p>Donec laoreet lobortis tellus. Nullam iaculis in lacus non eleifend. Duis imperdiet odio eget nibh pulvinar eleifend vitae vitae tortor. Praesent ullamcorper lorem quis dictum blandit. Nulla id facilisis nunc, ut tempus neque. Aenean aliquet neque lorem, sit amet porttitor libero tincidunt id. Nulla ac orci eu sem dictum tincidunt. Phasellus volutpat odio et nunc porta, eget cursus odio viverra.</p>
</div>
<div id="rating" class="rating">
<a href="javascript:void(0)" class="like">
<span class="glyphicon glyphicon-thumbs-up"></span> <span class="rating-value">5</span>
</a>
</div>
</article>
</main>
<!--gallery-->
<div class="gallery-wrapper">
<h2><?php echo t('Gallery') ?></h2>
<ul class="gallery">
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
<li><a href="<?php echo Zira\Helper::baseUrl('assets/images/designer/image.jpg') ?>"><img src="<?php echo Zira\Helper::baseUrl('assets/images/designer/thumb.jpg') ?>" width="<?php echo Zira\Config::get('thumbs_width') ?>" height="<?php echo Zira\Config::get('thumbs_height') ?>" /></a></li>
</ul>
</div>
<!--files-->
<div class="files-wrapper">
<ul class="files">
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 1 kB</li>
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 2 kB</li>
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 3 kB</li>
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 4 kB</li>
<li><a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('File') ?></a> 5 kB</li>
</ul>
</div>
<!--messages-->
<div class="alert alert-warning" role="alert"><a href="<?php echo Zira\Helper::url('') ?>">Lorem ipsum</a> dolor sit amet, consectetur adipiscing elit. Etiam tempus nec eros in auctor.</div>
<div class="alert alert-danger" role="alert"><a href="<?php echo Zira\Helper::url('') ?>">Lorem ipsum</a> dolor sit amet, consectetur adipiscing elit. Etiam tempus nec eros in auctor.</div>
<!--comments-->
<div class="comments-wrapper">
<div class="btn-group comment-btn-group" role="group">
<button class="btn btn-primary comment-btn scroll-down" data-target="#comments-form"><?php echo t('Leave a comment') ?></button>
<button class="btn btn-default comments-reload" type="button"><span class="glyphicon glyphicon-refresh"></span></button>
</div>
<h2 id="comments"><?php echo t('Comments') ?>(99)</h2>
<ul class="comments">
<li class="comments-item">
<?php echo Zira\User::generateUserProfileThumb(null, null, array('class'=>'comment-avatar')) ?>
<span class="comment-head">
<a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('Guest') ?></a></span>
<p class="comment-text parse-content parsed-content emoji-parsed-content">Lorem ipsum dolor sit amet</p>
<span class="comment-info">
<span class="glyphicon glyphicon-time"></span> <?php echo date(Zira\Config::get('date_format'), time()) ?> &nbsp;
<a href="javascript:void(0)" class="comment-rating comment-like">
<span class="glyphicon glyphicon-thumbs-up"></span>
<span class="rating-value">0</span>
</a> &nbsp;
<a href="javascript:void(0)" class="comment-rating comment-dislike">
<span class="glyphicon glyphicon-thumbs-down"></span>
<span class="rating-value">0</span>
</a> &nbsp;
</span>
</li>
<li class="comments-item comments-item-nested-1">
<?php echo Zira\User::generateUserProfileThumb(null, null, array('class'=>'comment-avatar')) ?>
<span class="comment-head">
<a href="<?php echo Zira\Helper::url('') ?>"><?php echo t('Guest') ?></a></span>
<p class="comment-text parse-content parsed-content emoji-parsed-content">Lorem ipsum dolor sit amet</p>
<span class="comment-info">
<span class="glyphicon glyphicon-time"></span> <?php echo date(Zira\Config::get('date_format'), time()) ?> &nbsp;
<a href="javascript:void(0)" class="comment-rating comment-like">
<span class="glyphicon glyphicon-thumbs-up"></span>
<span class="rating-value">0</span>
</a> &nbsp;
<a href="javascript:void(0)" class="comment-rating comment-dislike">
<span class="glyphicon glyphicon-thumbs-down"></span>
<span class="rating-value">0</span>
</a> &nbsp;
</span>
</li>
</ul>
<div class="comments-view-more-wrapper">
<button class="btn btn-primary comments-view-more" type="button" ><?php echo t('View more') ?>&nbsp;&rsaquo;&rsaquo;</button>
</div>
<div id="comments-form" class="comment-form-wrapper">
<?php echo new Zira\Forms\Comment(); ?>
</div>
</div>

1
zira/helper.php
View file

@ -34,6 +34,7 @@ class Helper {
$path=trim($path,'/');
if (self::$_add_language_to_url &&
!Router::isAllLanguagesRoute($path) &&
Locale::getLanguage() &&
Config::get('languages') &&
count(Config::get('languages'))>1 &&

14
zira/router.php
View file

@ -15,6 +15,7 @@ class Router {
protected static $action;
protected static $param;
protected static $available_routes = array('zira', 'user');
protected static $all_languages_routes = array('cron', 'sitemap.xml');
protected static $_map = array();
@ -89,6 +90,14 @@ class Router {
public static function addAvailableRoute($route) {
self::$available_routes []= $route;
}
public static function addAllLanguagesRoute($route) {
self::$all_languages_routes []= $route;
}
public static function isAllLanguagesRoute($route) {
return in_array($route, self::$all_languages_routes);
}
public static function dispatch() {
self::$request = trim(urldecode(Request::uri()));
@ -207,10 +216,9 @@ class Router {
if (!self::$language && count(Config::get('languages'))>1 &&
!empty(self::$request) &&
self::$request!='cron' &&
self::$request!='sitemap.xml' &&
self::$module!='dash' &&
self::$controller!='dash'
self::$controller!='dash' &&
!in_array(self::$request, self::$all_languages_routes)
) {
self::$language = Config::get('language');
Response::redirect(self::$language.'/'.self::$request, true);