Skip to content

Commit

Permalink
иконки от спонсора + мелочи
Browse files Browse the repository at this point in the history
  • Loading branch information
fuzegit committed Sep 26, 2017
1 parent 78e3d09 commit e0e27ba
Show file tree
Hide file tree
Showing 91 changed files with 12 additions and 33 deletions.
4 changes: 2 additions & 2 deletions install/languages/en/language.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
define('LANG_FINISH_TO_SITE', 'Visit site');

define('LANG_CFG_OFF_REASON', 'The site is closed for maintenance');
define('LANG_CFG_SITENAME', 'InstantCMS 2.0');
define('LANG_CFG_HOMETITLE', 'InstantCMS 2.0');
define('LANG_CFG_SITENAME', 'InstantCMS 2');
define('LANG_CFG_HOMETITLE', 'InstantCMS 2');
define('LANG_CFG_DATE_FORMAT', 'd.m.Y');
define('LANG_CFG_DATE_FORMAT_JS', 'dd.mm.yy');
define('LANG_CFG_TIME_ZONE', 'Europe/London');
Expand Down
4 changes: 2 additions & 2 deletions install/languages/ru/language.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
define('LANG_FINISH_TO_SITE', 'Перейти на сайт');

define('LANG_CFG_OFF_REASON', 'Идут технические работы');
define('LANG_CFG_SITENAME', 'InstantCMS 2.0');
define('LANG_CFG_HOMETITLE', 'InstantCMS 2.0');
define('LANG_CFG_SITENAME', 'InstantCMS 2');
define('LANG_CFG_HOMETITLE', 'InstantCMS 2');
define('LANG_CFG_DATE_FORMAT', 'd.m.Y');
define('LANG_CFG_DATE_FORMAT_JS', 'dd.mm.yy');
define('LANG_CFG_TIME_ZONE', 'Europe/Moscow');
Expand Down
2 changes: 1 addition & 1 deletion system/config/version.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
major = 2
minor = 8
build = 2
date = 20170000
date = 20170927
2 changes: 1 addition & 1 deletion system/languages/en/language.php
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@
define('LANG_MAIL_DEFAULT_ALT', 'Please view this e-mail with a client that supports HTML');

define('LANG_POWERED_BY_INSTANTCMS', 'Powered by <a href="http://instantcms.ru/">InstantCMS</a>');
define('LANG_ICONS_BY_FATCOW', 'Icons by <a href="http://www.fatcow.com/free-icons">FatCow</a>');
define('LANG_ICONS_BY_FATCOW', 'Icons by <a href="https://icons8.com/">Icons8</a>');
define('LANG_SUCCESS_MSG', 'Successfully saved');

define('LANG_DEBUG_QUERY_TIME', 'Runtime');
Expand Down
2 changes: 1 addition & 1 deletion system/languages/ru/language.php
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@
define('LANG_MAIL_DEFAULT_ALT', 'Для просмотра сообщения требуется почтовый клиент с поддержкой HTML');

define('LANG_POWERED_BY_INSTANTCMS', 'Работает на <a href="http://instantcms.ru/">InstantCMS</a>');
define('LANG_ICONS_BY_FATCOW', 'Иконки от <a href="http://www.fatcow.com/free-icons">FatCow</a>');
define('LANG_ICONS_BY_FATCOW', 'Иконки от <a href="https://ru.icons8.com/">Icons8</a>');
define('LANG_SUCCESS_MSG', 'Данные успешно сохранены');

define('LANG_DEBUG_QUERY_TIME', 'Время выполнения');
Expand Down
5 changes: 4 additions & 1 deletion templates/default/admin.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,11 @@
</div>

<script type="text/javascript">
var fit_layout_delta = 0;
function fitLayout(){
var h1 = $('#cp_body h1').offset().top + $('#cp_body h1').height();
var h2 = $('#cp_footer').offset().top;
$('table.layout').height(h2 - h1 - 2);
$('table.layout').height(h2 - h1 - 2 + fit_layout_delta);
$('table.layout').width( $('#cp_body').width() + 40 );
}
toolbarScroll = {
Expand Down Expand Up @@ -149,10 +150,12 @@ function fitLayout(){
if(!$(this.toolbar).hasClass('fixed_toolbar')){
$(this.toolbar).addClass('fixed_toolbar');
$(this.spacer).show();
fit_layout_delta = 30; fitLayout();
}
} else {
$(this.toolbar).removeClass('fixed_toolbar');
$(this.spacer).hide();
fit_layout_delta = 0; fitLayout();
}
}
};
Expand Down
26 changes: 1 addition & 25 deletions templates/default/controllers/admin/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,6 @@ a.ajaxlink:hover { text-decoration:none; border-bottom: dashed 1px #f90; }
display: inline-block;
margin-bottom: 10px;
}

.loading-overlay{
position: fixed;
width:100%;
height:100%;
left:0;
top:0;
background-image: url("../../images/admin/ajax-loader.gif");
background-repeat: no-repeat;
background-position: center center;
z-index: 100;
}
.anim_tooltip{
color: #ddd;
display: block;
Expand Down Expand Up @@ -1022,7 +1010,7 @@ ul.errors li .hint strong { color:#666666; }
}

.datagrid tr.selected td:first-child{
background: url("../../images/icons/check_small.png") no-repeat 7px center #fcf2cf;
background: url("../../images/icons/check_small.png") no-repeat 5px center #fcf2cf;
}

.datagrid tr.dragged td {
Expand Down Expand Up @@ -1296,18 +1284,6 @@ span.jPag-snext-img{
width:16px;
text-align:right;
}
ul.jPag-pages li span.jPag-previous-img{
background:transparent url("../../images/pagination/previous.png") no-repeat center right;
}
ul.jPag-pages li span.jPag-next-img{
background:transparent url("../../images/pagination/next.png") no-repeat center left;
}
span.jPag-sprevious-img{
background:transparent url("../../images/pagination/sprevious.png") no-repeat center right;
}
span.jPag-snext-img{
background:transparent url("../../images/pagination/snext.png") no-repeat center left;
}

/* ========================================================================== */
/* ========================================================================== */
Expand Down
Binary file removed templates/default/images/admin/ajax-loader.gif
Binary file not shown.
Binary file removed templates/default/images/album.png
Binary file not shown.
Binary file modified templates/default/images/datatree/icons.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/accept.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/basket.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/basket_put.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/basket_remove.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/bell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/blog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/book_open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/camera.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/cancel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/chartmap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/check_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/checklist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/coin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/coins_add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/coins_delete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/comment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/config.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/controller.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/cpanel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/delete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/download.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/default/images/icons/edit.png
Binary file modified templates/default/images/icons/error.png
Binary file modified templates/default/images/icons/eye.png
Binary file modified templates/default/images/icons/file.png
Binary file modified templates/default/images/icons/filter.png
Binary file modified templates/default/images/icons/filter_delete.png
Binary file modified templates/default/images/icons/flag_check.png
Binary file modified templates/default/images/icons/flag_lock.png
Binary file modified templates/default/images/icons/folder.png
Binary file modified templates/default/images/icons/folder_add.png
Binary file modified templates/default/images/icons/folder_delete.png
Binary file modified templates/default/images/icons/folder_edit.png
Binary file modified templates/default/images/icons/folders.png
Binary file modified templates/default/images/icons/folders_explorer.png
Binary file modified templates/default/images/icons/form.png
Binary file modified templates/default/images/icons/group.png
Binary file modified templates/default/images/icons/group_add.png
Binary file modified templates/default/images/icons/group_delete.png
Binary file modified templates/default/images/icons/help.png
Binary file modified templates/default/images/icons/images.png
Binary file modified templates/default/images/icons/info.png
Binary file modified templates/default/images/icons/install.png
Binary file modified templates/default/images/icons/item.png
Binary file modified templates/default/images/icons/key.png
Binary file modified templates/default/images/icons/labels.png
Binary file modified templates/default/images/icons/lock.png
Binary file modified templates/default/images/icons/logout.png
Binary file modified templates/default/images/icons/logs.png
Binary file modified templates/default/images/icons/mail.png
Binary file modified templates/default/images/icons/medal_bronze.png
Binary file modified templates/default/images/icons/medal_gold.png
Binary file modified templates/default/images/icons/medal_silver.png
Binary file modified templates/default/images/icons/menu.png
Binary file modified templates/default/images/icons/messages.png
Binary file modified templates/default/images/icons/move_to_folder.png
Binary file modified templates/default/images/icons/newspaper_add.png
Binary file modified templates/default/images/icons/newspaper_delete.png
Binary file modified templates/default/images/icons/package_go.png
Binary file modified templates/default/images/icons/page_gear.png
Binary file modified templates/default/images/icons/play.png
Binary file modified templates/default/images/icons/profile.png
Binary file modified templates/default/images/icons/refresh.png
Binary file modified templates/default/images/icons/rss.png
Binary file modified templates/default/images/icons/save.png
Binary file modified templates/default/images/icons/search.png
Binary file modified templates/default/images/icons/settings.png
Binary file modified templates/default/images/icons/tag.png
Binary file modified templates/default/images/icons/transfer.png
Binary file modified templates/default/images/icons/unbind.png
Binary file modified templates/default/images/icons/user.png
Binary file modified templates/default/images/icons/user_add.png
Binary file modified templates/default/images/icons/user_delete.png
Binary file modified templates/default/images/icons/view_list.png
Binary file modified templates/default/images/icons/vote_thumbs.png
Binary file modified templates/default/images/icons/www_page.png
Binary file removed templates/default/images/pagination/next.png
Diff not rendered.
Binary file removed templates/default/images/pagination/previous.png
Diff not rendered.
Binary file removed templates/default/images/pagination/snext.png
Diff not rendered.
Binary file removed templates/default/images/pagination/sprevious.png
Diff not rendered.

0 comments on commit e0e27ba

Please sign in to comment.