From 792acd7b17591a833b7e540a70daeb7ab541db4a Mon Sep 17 00:00:00 2001 From: "Fedor A. Fetisov" Date: Tue, 16 Dec 2014 17:19:49 +0300 Subject: [PATCH] Beautify stylesheets and fix #73 --- .../js/source/default/model_views/message.js | 4 +- src/mibew/js/source/soundcheck.js | 4 +- .../collection_views/threads_collection.js | 8 +- src/mibew/js/source/widget.js | 16 +- .../Mibew/Button/Generator/ImageGenerator.php | 2 +- src/mibew/libs/pagination.php | 4 +- src/mibew/styles/chats/default/chat.css | 236 +-- src/mibew/styles/chats/default/chat_ie7.css | 8 +- .../client_side/_logo.handlebars | 2 +- .../chat/controls/user_name.handlebars | 2 +- .../client_side/chat/layout.handlebars | 6 +- .../client_side/chat/message.handlebars | 4 +- .../client_side/chat/message_form.handlebars | 4 +- .../leave_message/description.handlebars | 4 +- .../client_side/leave_message/form.handlebars | 2 +- .../leave_message/layout.handlebars | 2 +- .../leave_message/sent_description.handlebars | 4 +- .../client_side/message.handlebars | 4 +- .../client_side/survey/form.handlebars | 2 +- .../client_side/survey/layout.handlebars | 6 +- .../server_side/_layout.handlebars | 6 +- .../server_side/confirm.handlebars | 2 +- .../server_side/error.handlebars | 2 +- .../templates_src/server_side/mail.handlebars | 2 +- .../server_side/mailsent.handlebars | 2 +- .../server_side/nochat.handlebars | 2 +- .../server_side/redirect.handlebars | 2 +- .../server_side/redirected.handlebars | 2 +- .../styles/invitations/default/invite.css | 42 +- .../styles/pages/default/css/default.css | 1448 ++++++++--------- .../styles/pages/default/css/default_ie.css | 6 +- src/mibew/styles/pages/default/js/locale.js | 24 +- .../client_side/message.handlebars | 4 +- .../client_side/users/status_panel.handlebars | 2 +- .../users/visitors_collection.handlebars | 2 +- .../server_side/_errors.handlebars | 2 +- .../server_side/_layout.handlebars | 18 +- .../server_side/_menu.handlebars | 2 +- .../templates_src/server_side/ban.handlebars | 42 +- .../templates_src/server_side/bans.handlebars | 6 +- .../server_side/button_code.handlebars | 84 +- .../canned_message_edit.handlebars | 28 +- .../server_side/canned_messages.handlebars | 18 +- .../server_side/group_edit.handlebars | 108 +- .../server_side/group_members.handlebars | 20 +- .../server_side/groups.handlebars | 24 +- .../server_side/history.handlebars | 34 +- .../server_side/history_thread.handlebars | 26 +- .../server_side/index.handlebars | 64 +- .../server_side/install_done.handlebars | 4 +- .../server_side/install_password.handlebars | 18 +- .../server_side/install_step.handlebars | 12 +- .../server_side/locales.handlebars | 16 +- .../server_side/login.handlebars | 26 +- .../server_side/mail_template_edit.handlebars | 28 +- .../server_side/mail_templates.handlebars | 16 +- .../server_side/operator_avatar.handlebars | 36 +- .../server_side/operator_edit.handlebars | 76 +- .../server_side/operator_groups.handlebars | 24 +- .../operator_permissions.handlebars | 18 +- .../server_side/operators.handlebars | 24 +- .../server_side/password_recovery.handlebars | 18 +- .../password_recovery_reset.handlebars | 24 +- .../server_side/plugins.handlebars | 6 +- .../server_side/settings_common.handlebars | 132 +- .../server_side/settings_features.handlebars | 140 +- .../settings_performance.handlebars | 116 +- .../server_side/statistics.handlebars | 40 +- .../server_side/style_preview.handlebars | 22 +- .../server_side/tracked.handlebars | 8 +- .../server_side/translation_edit.handlebars | 26 +- .../server_side/translation_export.handlebars | 20 +- .../server_side/translation_import.handlebars | 36 +- .../server_side/translations.handlebars | 16 +- .../server_side/update_intro.handlebars | 12 +- .../server_side/update_progress.handlebars | 12 +- .../server_side/updates.handlebars | 12 +- .../server_side/users.handlebars | 2 +- 78 files changed, 1590 insertions(+), 1698 deletions(-) diff --git a/src/mibew/js/source/default/model_views/message.js b/src/mibew/js/source/default/model_views/message.js index 7f099085..30f4e18e 100644 --- a/src/mibew/js/source/default/model_views/message.js +++ b/src/mibew/js/source/default/model_views/message.js @@ -75,10 +75,10 @@ return "hidden"; } if (kind == this.model.KIND_INFO) { - return "inf"; + return "info"; } if (kind == this.model.KIND_CONN) { - return "conn"; + return "connection"; } if (kind == this.model.KIND_EVENTS) { return "event"; diff --git a/src/mibew/js/source/soundcheck.js b/src/mibew/js/source/soundcheck.js index eaa0456c..01d85518 100644 --- a/src/mibew/js/source/soundcheck.js +++ b/src/mibew/js/source/soundcheck.js @@ -18,11 +18,11 @@ (function(Mibew, $) { $(document).ready(function() { - $('#check-nv').click(function(){ + $('#check-new-visitor').click(function(){ Mibew.Utils.playSound('../sounds/new_user'); }); - $('#check-nm').click(function() { + $('#check-new-message').click(function() { Mibew.Utils.playSound('../sounds/new_message'); }); }); diff --git a/src/mibew/js/source/users/collection_views/threads_collection.js b/src/mibew/js/source/users/collection_views/threads_collection.js index 6cc9680c..59827fa1 100644 --- a/src/mibew/js/source/users/collection_views/threads_collection.js +++ b/src/mibew/js/source/users/collection_views/threads_collection.js @@ -120,7 +120,7 @@ } // Create new style name - var style = ((queueCode != this.QUEUE_BAN)?'in':'') + var style = ((queueCode != this.QUEUE_BAN)?'in-':'') + this.queueCodeToString(queueCode); // Store new styles @@ -216,16 +216,16 @@ */ queueCodeToString: function(code) { if (code == this.QUEUE_PRIO) { - return "prio"; + return "priority-queue"; } if (code == this.QUEUE_WAITING) { - return "wait"; + return "waiting"; } if (code == this.QUEUE_CHATTING) { return "chat"; } if (code == this.QUEUE_BAN) { - return "ban"; + return "banned"; } if (code == this.QUEUE_CLOSED) { return "closed"; diff --git a/src/mibew/js/source/widget.js b/src/mibew/js/source/widget.js index 47af18b2..79f1619f 100644 --- a/src/mibew/js/source/widget.js +++ b/src/mibew/js/source/widget.js @@ -391,8 +391,8 @@ var Mibew = {}; var threadUrl = options.threadUrl; var acceptCaption = options.acceptCaption; - var popuptext = '