Merge pull request #102 from Mibew/dashboard

Dashboard
This commit is contained in:
Dmitriy S. Simushev 2015-01-20 16:58:05 +03:00
commit 78dfb230ed
9 changed files with 100 additions and 11 deletions

View File

@ -92,7 +92,7 @@ a {
overflow: hidden; overflow: hidden;
} }
.content-no-menu { .content-no-menu {
padding: 10px 60px 10px 20px; padding: 10px 20px 10px 20px;
} }
.empty-inner { .empty-inner {
height: 40px; height: 40px;
@ -401,9 +401,8 @@ input.field-input {
margin-right: 15px; margin-right: 15px;
padding-right: 0; padding-right: 0;
} }
#form-message { #form-message,
border: 1px solid #4c96d4; #offline-dashboard-warning {
background-color: #e7f1f9;
padding: 8px 11px; padding: 8px 11px;
font-size: 0.85em; font-size: 0.85em;
font-weight: bold; font-weight: bold;
@ -411,7 +410,16 @@ input.field-input {
margin: -10px 2px 10px; margin: -10px 2px 10px;
color: #515151; color: #515151;
} }
#form-message img.warning { #form-message {
border: 1px solid #4c96d4;
background-color: #e7f1f9;
}
#offline-dashboard-warning {
border: 1px solid #4cd496;
background-color: #e7f9f1;
}
#form-message img.warning,
#offline-dashboard-warning img.warning {
height: 24px; height: 24px;
width: 24px; width: 24px;
vertical-align: middle; vertical-align: middle;
@ -770,14 +778,19 @@ table.awaiting .no-visitors {
width: 100%; width: 100%;
} }
.dashboard-item { .dashboard-item {
width: 32%; width: 300px;
height: 200px;
margin-bottom: 0.4em;
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
border: 1px solid #ededed;
} }
.dashboard-item-content { .dashboard-item-content {
padding: 5px 2em 5em; padding: 5px 2em 5em;
} }
.dashboard-item:hover { .dashboard-item:hover {
background-color: #efefef;
cursor: pointer;
} }
.dashboard-item a { .dashboard-item a {
padding-top: 6px; padding-top: 6px;

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -0,0 +1,30 @@
/*!
* This file is a part of Mibew Messenger.
*
* Copyright 2005-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
(function($, document) {
$(function(){
$("#dashboard").on("click", "div.dashboard-item", function(){
var anchor = $(this).find("a").eq(0);
if (anchor != undefined) {
if ($(anchor).triggerHandler('click') === undefined) {
window.location.href = $(anchor).attr('href');
}
}
});
});
})(jQuery, document);

View File

@ -61,16 +61,16 @@
} }
$(function(){ $(function(){
$("#change-language").click(function(){ $("#change-language").on('click', function(){
centerPopup(); centerPopup();
loadPopup(); loadPopup();
return false; return false;
}); });
$("#dashboard-locales-popup-close").click(function(){ $("#dashboard-locales-popup-close").on('click', function(){
disablePopup(); disablePopup();
return false; return false;
}); });
$("#background-popup").click(function(){ $("#background-popup").on('click', function(){
disablePopup(); disablePopup();
}); });
$(document).keypress(function(e){ $(document).keypress(function(e){

View File

@ -3,10 +3,9 @@
{{#if localeLinks}} {{#if localeLinks}}
<script type="text/javascript" language="javascript" src="{{asset "@CurrentStyle/js/locale.js"}}"></script> <script type="text/javascript" language="javascript" src="{{asset "@CurrentStyle/js/locale.js"}}"></script>
{{/if}} {{/if}}
<script type="text/javascript" language="javascript" src="{{asset "@CurrentStyle/js/dashboard.js"}}"></script>
{{/override}} {{/override}}
{{#override "menu"}}{{> _menu}}{{/override}}
{{#override "content"}} {{#override "content"}}
<br/> <br/>
{{#if needUpdate}} {{#if needUpdate}}
@ -14,6 +13,13 @@
<br/> <br/>
{{/if}} {{/if}}
{{#if warnOffline}}
{{#unless isOnline}}
<div id="offline-dashboard-warning"><img src="{{asset "@CurrentStyle/images/dash/warning.png"}}" alt="" class="warning"/> {{{l10n "You are Offline. <a href=\"{0}\">Connect...</a>" (route "users" nomenu="1")}}}</div>
<br/>
{{/unless}}
{{/if}}
<div id="dashboard"> <div id="dashboard">
<div class="dashboard-item"> <div class="dashboard-item">
<div class="dashboard-item-content"> <div class="dashboard-item-content">
@ -109,6 +115,46 @@
{{l10n "Specify options affecting chat window and common system behavior."}} {{l10n "Specify options affecting chat window and common system behavior."}}
</div> </div>
</div> </div>
<div class="dashboard-item">
<div class="dashboard-item-content">
<img src="{{asset "@CurrentStyle/images/dash/plugins.png"}}" alt=""/>
<a href="{{route "plugins"}}">
{{l10n "Plugins"}}
</a>
{{l10n "Manage plugins."}}
</div>
</div>
<div class="dashboard-item">
<div class="dashboard-item-content">
<img src="{{asset "@CurrentStyle/images/dash/styles.png"}}" alt=""/>
<a href="{{route "style_preview" type="page"}}">
{{l10n "Styles"}}
</a>
{{l10n "Manage styles."}}
</div>
</div>
<div class="dashboard-item">
<div class="dashboard-item-content">
<img src="{{asset "@CurrentStyle/images/dash/translations.png"}}" alt=""/>
<a href="{{route "translations"}}">
{{l10n "Translations"}}
</a>
{{l10n "Manage translations."}}
</div>
</div>
<div class="dashboard-item">
<div class="dashboard-item-content">
<img src="{{asset "@CurrentStyle/images/dash/mail_templates.png"}}" alt=""/>
<a href="{{route "mail_templates"}}">
{{l10n "Mail templates"}}
</a>
{{l10n "Manage mail templates."}}
</div>
</div>
{{/if}} {{/if}}
{{#if currentopid}} {{#if currentopid}}