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

online widget, minor fixes

Browse source
This commit is contained in:
Dro1d.Ru 2017-11-30 19:43:08 +05:00
parent 296ad93e36
commit 32c79b635f
8 changed files with 52 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,3 +6,4 @@
/robots.txt /robots.txt
/.htaccess /.htaccess
/nbproject/ /nbproject/
/.vscode/

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

@ -473,7 +473,7 @@
var topmenu_cy = $('header #top-menu-wrapper nav').offset().top+($('header #top-menu-wrapper nav').outerHeight()-colorpicker_size)/2; var topmenu_cy = $('header #top-menu-wrapper nav').offset().top+($('header #top-menu-wrapper nav').outerHeight()-colorpicker_size)/2;
$('#topmenu-color-designer-gradientpicker').css({'left':topmenu_cx,'top':topmenu_cy}); $('#topmenu-color-designer-gradientpicker').css({'left':topmenu_cx,'top':topmenu_cy});
$('#topmenu-color-designer-gradientpicker-hidden').css({'left':topmenu_cx+colorpicker_wnd_size,'top':topmenu_cy}); $('#topmenu-color-designer-gradientpicker-hidden').css({'left':topmenu_cx+colorpicker_wnd_size,'top':topmenu_cy});
$('#toprmenu-color-designer-gradientpicker').show(); $('#topmenu-color-designer-gradientpicker').show();
$('#topmenu-color-designer-gradientpicker-hidden').show(); $('#topmenu-color-designer-gradientpicker-hidden').show();
}; };
$('#topmenu-color-designer-gradientpicker').tooltip(); $('#topmenu-color-designer-gradientpicker').tooltip();
@ -513,9 +513,13 @@
setBackgroundStyle('header #top-menu-wrapper .navbar-default .navbar-nav .open,header #top-menu-wrapper .navbar-default .navbar-nav .active,header #top-menu-wrapper .navbar-default .navbar-nav .active a,header #top-menu-wrapper .navbar-default .navbar-nav .open a,header #top-menu-wrapper nav ul.dropdown-menu,header #top-menu-wrapper nav .form-control,header #top-menu-wrapper nav .btn-default,header .zira-search-preview-wnd .list .list-item:hover .list-title-wrapper', hexColor(color2)); setBackgroundStyle('header #top-menu-wrapper .navbar-default .navbar-nav .open,header #top-menu-wrapper .navbar-default .navbar-nav .active,header #top-menu-wrapper .navbar-default .navbar-nav .active a,header #top-menu-wrapper .navbar-default .navbar-nav .open a,header #top-menu-wrapper nav ul.dropdown-menu,header #top-menu-wrapper nav .form-control,header #top-menu-wrapper nav .btn-default,header .zira-search-preview-wnd .list .list-item:hover .list-title-wrapper', hexColor(color2));
setBackgroundStyle('#top-menu-wrapper ul.dropdown-menu li a:hover,#top-menu-wrapper ul.dropdown-menu li a:focus,#top-menu-wrapper .navbar-default .navbar-nav .open ul.dropdown-menu li a:hover,header .zira-search-preview-wnd .list .list-item .list-title-wrapper', hexColor(color1)); setBackgroundStyle('#top-menu-wrapper ul.dropdown-menu li a:hover,#top-menu-wrapper ul.dropdown-menu li a:focus,#top-menu-wrapper .navbar-default .navbar-nav .open ul.dropdown-menu li a:hover,header .zira-search-preview-wnd .list .list-item .list-title-wrapper', hexColor(color1));
setBackgroundColorStyle('header #top-menu-wrapper .navbar-default .navbar-toggle:focus,header #top-menu-wrapper .navbar-default .navbar-toggle:hover', hexColor(color1), true); setBackgroundColorStyle('header #top-menu-wrapper .navbar-default .navbar-toggle:focus,header #top-menu-wrapper .navbar-default .navbar-toggle:hover', hexColor(color1), true);
setBorderColorStyle('header #top-menu-wrapper nav.navbar-default,header #top-menu-wrapper .navbar-default .navbar-nav .active,header #top-menu-wrapper nav ul.dropdown-menu,header #top-menu-wrapper nav .form-control,header #top-menu-wrapper nav .btn-default,header .navbar-default .navbar-toggle,header .navbar-default .navbar-collapse,.navbar-default .navbar-form,header .zira-search-preview-wnd,header .zira-search-preview-wnd .list .list-item,header .zira-search-preview-wnd .list .list-item:hover,header .zira-search-preview-wnd .list .list-item:last-child,header .zira-search-preview-wnd .list .list-item .list-title-wrapper', hexColor(color1)); setBorderColorStyle('header #top-menu-wrapper nav.navbar-default,header #top-menu-wrapper .navbar-default .navbar-nav .active,header #top-menu-wrapper nav ul.dropdown-menu,header #top-menu-wrapper nav .form-control,header #top-menu-wrapper nav .btn-default,header .navbar-default .navbar-toggle,header .navbar-default .navbar-collapse,.navbar-default .navbar-form,header .zira-search-preview-wnd,header .zira-search-preview-wnd .list .list-item,header .zira-search-preview-wnd .list .list-item:hover,header .zira-search-preview-wnd .list .list-item .list-title-wrapper,header #top-menu-wrapper.fixed', hexColor(color1));
setBorderColorStyle('header .zira-search-preview-wnd .list .list-item:last-child', hexColor(color1));
setTextShadowStyle('header #top-menu-wrapper nav a:link,header #top-menu-wrapper nav a:visited,header #top-menu-wrapper .btn-default', '0 1px 0 '+hexColor(color2)); setTextShadowStyle('header #top-menu-wrapper nav a:link,header #top-menu-wrapper nav a:visited,header #top-menu-wrapper .btn-default', '0 1px 0 '+hexColor(color2));
setFilterStyle('#top-menu-wrapper .navbar-default .navbar-nav .active a,#top-menu-wrapper .navbar-default .navbar-nav .open a,#top-menu-wrapper nav .btn-default', 'none'); setFilterStyle('#top-menu-wrapper .navbar-default .navbar-nav .active a,#top-menu-wrapper .navbar-default .navbar-nav .open a,#top-menu-wrapper nav .btn-default', 'none');
setBackgroundColorStyle('::-webkit-scrollbar,::-webkit-scrollbar-button,::-webkit-scrollbar-track,::-webkit-scrollbar-track-piece', 'transparent');
setBackgroundColorStyle('::-webkit-scrollbar-thumb,::-webkit-scrollbar-corner,::-webkit-resizer', color2);
setWidthStyle('::-webkit-scrollbar','10px');
}); });
} }
} }
@ -1196,7 +1200,8 @@
setBackgroundStyle('.emoji-editable', color2); setBackgroundStyle('.emoji-editable', color2);
setBorderColorStyle('.emoji-editable', color1); setBorderColorStyle('.emoji-editable', color1);
setBackgroundStyle('#main-container .panel .dropdown-menu', color2); setBackgroundStyle('#main-container .panel .dropdown-menu', color2);
setBackgroundStyle('#main-container .panel .bootstrap-datetimepicker-widget table td.day:hover,#main-container .panel .bootstrap-datetimepicker-widget table td.hour:hover,#main-container .panel .bootstrap-datetimepicker-widget table td.minute:hover,#main-container .panel .bootstrap-datetimepicker-widget table td.second:hover,#main-container .panel .bootstrap-datetimepicker-widget table thead tr:first-child th:hover', color1); setBackgroundStyle('#main-container .panel .bootstrap-datetimepicker-widget table td.day:hover,#main-container .panel .bootstrap-datetimepicker-widget table td.hour:hover,#main-container .panel .bootstrap-datetimepicker-widget table td.minute:hover,#main-container .panel .bootstrap-datetimepicker-widget table td.second:hover', color1);
setBackgroundStyle('#main-container .panel .bootstrap-datetimepicker-widget table thead tr:first-child th:hover', color1);
}, 'right', 'rgb'); }, 'right', 'rgb');
} }

13
themes/bulaksu/assets/css/main.css
View file

@ -453,7 +453,8 @@ ul#language-switcher li a.active {
top: 0; top: 0;
margin: 0; margin: 0;
z-index: 999; z-index: 999;
box-shadow: 0px 0px 10px #000; box-shadow: 0px -3px 10px #000;
border-bottom: 1px solid #eee;
} }
#top-menu-wrapper.fixed nav { #top-menu-wrapper.fixed nav {
border-radius: 0; border-radius: 0;
@ -1619,16 +1620,22 @@ a.scroll-top.visible span {
padding: 0; padding: 0;
} }
.widget-online-wrapper .widget-online-list li { .widget-online-wrapper .widget-online-list li {
width: 50px;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
margin: 7px; margin: 7px;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 12px;
} }
.widget-online-wrapper .widget-online-list .user-online { .widget-online-wrapper .widget-online-list .user-online {
max-width: 50px; width: 40px;
height: auto; height: auto;
width: 50px\9; /** ie8 hack **/
display: block; display: block;
border-radius: 25px; border-radius: 25px;
margin: 0px auto 2px;
} }
/** mobile **/ /** mobile **/

5
themes/bulaksu/zira/widgets/online.php
View file

@ -8,7 +8,10 @@
<?php if (!empty($users) && !empty($count)): ?> <?php if (!empty($users) && !empty($count)): ?>
<ul class="widget-online-list"> <ul class="widget-online-list">
<?php foreach($users as $user): ?> <?php foreach($users as $user): ?>
<li><?php echo Zira\User::generateUserProfileThumbLink($user->id, $user->firstname, $user->secondname, $user->username, null, $user->image, null, array('class'=>'user-online')) ?></li> <li>
<?php echo Zira\User::generateUserProfileThumbLink($user->id, $user->firstname, $user->secondname, $user->username, null, $user->image, null, array('class'=>'user-online')) ?>
<?php echo Zira\User::generateUserProfileLink($user->id, $user->firstname, $user->secondname, $user->username); ?>
</li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php else: ?> <?php else: ?>

13
themes/dark/assets/css/main.css
View file

@ -747,7 +747,8 @@ header #top-menu-wrapper nav .btn-default {
top: 0; top: 0;
margin: 0; margin: 0;
z-index: 999; z-index: 999;
box-shadow: 0px 0px 10px #000; box-shadow: 0px -3px 10px #000;
border-bottom: 1px solid #333;
} }
#top-menu-wrapper.fixed nav { #top-menu-wrapper.fixed nav {
border-radius: 0; border-radius: 0;
@ -2079,16 +2080,22 @@ ul.vote-results li .vote-result {
padding: 0; padding: 0;
} }
.widget-online-wrapper .widget-online-list li { .widget-online-wrapper .widget-online-list li {
width: 50px;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
margin: 7px 5px; margin: 7px 5px;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 12px;
} }
.widget-online-wrapper .widget-online-list .user-online { .widget-online-wrapper .widget-online-list .user-online {
max-width: 50px; width: 40px;
height: auto; height: auto;
width: 50px\9; /** ie8 hack **/
display: block; display: block;
border-radius: 25px; border-radius: 25px;
margin: 0px auto 2px;
} }
/** mobile **/ /** mobile **/

5
themes/dark/zira/widgets/online.php
View file

@ -8,7 +8,10 @@
<?php if (!empty($users) && !empty($count)): ?> <?php if (!empty($users) && !empty($count)): ?>
<ul class="widget-online-list"> <ul class="widget-online-list">
<?php foreach($users as $user): ?> <?php foreach($users as $user): ?>
<li><?php echo Zira\User::generateUserProfileThumbLink($user->id, $user->firstname, $user->secondname, $user->username, null, $user->image, null, array('class'=>'user-online')) ?></li> <li>
<?php echo Zira\User::generateUserProfileThumbLink($user->id, $user->firstname, $user->secondname, $user->username, null, $user->image, null, array('class'=>'user-online')) ?>
<?php echo Zira\User::generateUserProfileLink($user->id, $user->firstname, $user->secondname, $user->username); ?>
</li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php else: ?> <?php else: ?>

13
themes/default/assets/css/main.css
View file

@ -485,7 +485,8 @@ ul#language-switcher li a.active {
top: 0; top: 0;
margin: 0; margin: 0;
z-index: 999; z-index: 999;
box-shadow: 0px 0px 10px #000; box-shadow: 0px -3px 10px #000;
border-bottom: 1px solid #eee;
} }
#top-menu-wrapper.fixed nav { #top-menu-wrapper.fixed nav {
border-radius: 0; border-radius: 0;
@ -1672,16 +1673,22 @@ a.scroll-top.visible span {
padding: 0; padding: 0;
} }
.widget-online-wrapper .widget-online-list li { .widget-online-wrapper .widget-online-list li {
width: 50px;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
margin: 7px 5px; margin: 7px 5px;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 12px;
} }
.widget-online-wrapper .widget-online-list .user-online { .widget-online-wrapper .widget-online-list .user-online {
max-width: 50px; width: 40px;
height: auto; height: auto;
width: 50px\9; /** ie8 hack **/
display: block; display: block;
border-radius: 25px; border-radius: 25px;
margin: 0px auto 2px;
} }
/** mobile **/ /** mobile **/

5
themes/default/zira/widgets/online.php
View file

@ -8,7 +8,10 @@
<?php if (!empty($users) && !empty($count)): ?> <?php if (!empty($users) && !empty($count)): ?>
<ul class="widget-online-list"> <ul class="widget-online-list">
<?php foreach($users as $user): ?> <?php foreach($users as $user): ?>
<li><?php echo Zira\User::generateUserProfileThumbLink($user->id, $user->firstname, $user->secondname, $user->username, null, $user->image, null, array('class'=>'user-online')) ?></li> <li>
<?php echo Zira\User::generateUserProfileThumbLink($user->id, $user->firstname, $user->secondname, $user->username, null, $user->image, null, array('class'=>'user-online')) ?>
<?php echo Zira\User::generateUserProfileLink($user->id, $user->firstname, $user->secondname, $user->username); ?>
</li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
<?php else: ?> <?php else: ?>