Add a section to display keyboard shorcuts

2015-02-14 23:09:53 -05:00 · 2015-02-14 23:09:53 -05:00 · 998ef43e53
parent 627d8aaa8c
commit 998ef43e53
18 changed files with 96 additions and 12 deletions
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@ -726,4 +726,9 @@ return array(
    '%b %e' => '%e %b',
    'Expand tasks' => 'Déplier les tâches',
    'Collapse tasks' => 'Replier les tâches',
+    'Expand/collapse tasks' => 'Plier/déplier les tâches',
+    'Close dialog box' => 'Fermer une boite de dialogue',
+    'Submit a form' => 'Enregistrer un formulaire',
+    'Board view' => 'Page du tableau',
+    'Keyboard shortcuts' => 'Raccourcis clavier',
 );
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@ -724,4 +724,9 @@ return array(
    // '%b %e' => '',
    // 'Expand tasks' => '',
    // 'Collapse tasks' => '',
+    // 'Expand/collapse tasks' => '',
+    // 'Close dialog box' => '',
+    // 'Submit a form' => '',
+    // 'Board view' => '',
+    // 'Keyboard shortcuts' => '',
 );
--- a/app/Template/config/about.php
+++ b/app/Template/config/about.php
@ -1,7 +1,7 @@
 <div class="page-header">
    <h2><?= t('About') ?></h2>
 </div>
-<section class="listing">
+<div class="listing">
    <ul>
        <li>
            <?= t('Official website:') ?>
@ -12,12 +12,11 @@
            <strong><?= APP_VERSION ?></strong>
        </li>
    </ul>
-</section>
-
+</div>
 <div class="page-header">
    <h2><?= t('Database') ?></h2>
 </div>
-<section class="listing">
+<div class="listing">
    <ul>
        <li>
            <?= t('Database driver:') ?>
@ -38,4 +37,19 @@
            </li>
        <?php endif ?>
    </ul>
-</section>
+</div>
+<div class="page-header">
+    <h2><?= t('Keyboard shortcuts') ?></h2>
+</div>
+<div class="listing">
+    <h3><?= t('Board view') ?></h3>
+    <ul>
+        <li><?= t('New task') ?> = <strong>n</strong></li>
+        <li><?= t('Expand/collapse tasks') ?> = <strong>s</strong></li>
+    </ul>
+    <h3><?= t('Application') ?></h3>
+    <ul>
+        <li><?= t('Close dialog box') ?> = <strong>ESC</strong></li>
+        <li><?= t('Submit a form') ?> = <strong>CTRL+ENTER</strong> <?= t('or') ?> <strong>⌘+ENTER</strong></li>
+    </ul>
+</div>
--- a/assets/js/app.js
+++ b/assets/js/app.js
@ -139,7 +139,7 @@ var Kanboard=function(){jQuery(document).ready(function(){Kanboard.Init()});retu
 $("#popover-content").click(function(a){a.stopPropagation()});$(".close-popover").click(function(a){a.preventDefault();$("#popover-container").remove()});Mousetrap.bind("esc",function(){$("#popover-container").remove()});c&&c()})},IsVisible:function(){var a="";"undefined"!==typeof document.hidden?a="visibilityState":"undefined"!==typeof document.mozHidden?a="mozVisibilityState":"undefined"!==typeof document.msHidden?a="msVisibilityState":"undefined"!==typeof document.webkitHidden&&(a="webkitVisibilityState");
 return""!=a?"visible"==document[a]:!0},SetStorageItem:function(a,c){"undefined"!==typeof Storage&&localStorage.setItem(a,c)},GetStorageItem:function(a){return"undefined"!==typeof Storage?localStorage.getItem(a):""},MarkdownPreview:function(a){a.preventDefault();var c=$(this),b=$(this).closest("ul"),d=$(".write-area"),e=$(".preview-area"),f=$("textarea");$.ajax({url:"?controller=app&action=preview",contentType:"application/json",type:"POST",processData:!1,dataType:"html",data:JSON.stringify({text:f.val()})}).done(function(a){b.find("li").removeClass("form-tab-selected");
 c.parent().addClass("form-tab-selected");e.find(".markdown").html(a);e.css("height",f.css("height"));e.css("width",f.css("width"));d.hide();e.show()})},MarkdownWriter:function(a){a.preventDefault();$(this).closest("ul").find("li").removeClass("form-tab-selected");$(this).parent().addClass("form-tab-selected");$(".write-area").show();$(".preview-area").hide()},CheckSession:function(){$(".form-login").length||$.ajax({cache:!1,url:$("body").data("status-url"),statusCode:{401:function(a){window.location=
-$("body").data("login-url")}}})},Init:function(){$("#board-selector").chosen({width:180});$("#board-selector").change(function(){window.location=$(this).attr("data-board-url").replace(/PROJECT_ID/g,$(this).val())});window.setInterval(Kanboard.CheckSession,6E4);$(".popover-subtask-restriction").click(Kanboard.Popover);$(".file-popover").click(Kanboard.Popover);Mousetrap.bind("ctrl+enter",function(){$("form").submit()});$(".column-tooltip").tooltip({content:function(a){return'<div class="markdown">'+
+$("body").data("login-url")}}})},Init:function(){$("#board-selector").chosen({width:180});$("#board-selector").change(function(){window.location=$(this).attr("data-board-url").replace(/PROJECT_ID/g,$(this).val())});window.setInterval(Kanboard.CheckSession,6E4);$(".popover-subtask-restriction").click(Kanboard.Popover);$(".file-popover").click(Kanboard.Popover);Mousetrap.bind("mod+enter",function(){$("form").submit()});$(".column-tooltip").tooltip({content:function(a){return'<div class="markdown">'+
 $(this).attr("title")+"</div>"}});$.datepicker.setDefaults($.datepicker.regional[$("body").data("js-lang")]);Kanboard.InitAfterAjax()},InitAfterAjax:function(){$(".form-date").datepicker({showOtherMonths:!0,selectOtherMonths:!0,dateFormat:"yy-mm-dd",constrainInput:!1});$("#markdown-preview").click(Kanboard.MarkdownPreview);$("#markdown-write").click(Kanboard.MarkdownWriter);$(".auto-select").focus(function(){$(this).select()});$(".dropit-submenu").hide();$(".dropdown").not(".dropit").dropit()}}}();
 Kanboard.Board=function(){function a(a){Kanboard.Popover(a,Kanboard.InitAfterAjax)}function c(){Mousetrap.bind("n",function(){Kanboard.OpenPopover($(".task-creation-popover").attr("href"),Kanboard.InitAfterAjax)});Mousetrap.bind("s",function(){"expanded"===(Kanboard.GetStorageItem(d())||"expanded")?(e(),Kanboard.SetStorageItem(d(),"collapsed")):(f(),Kanboard.SetStorageItem(d(),"expanded"))})}function b(){$(".filter-expand-link").click(function(a){a.preventDefault();f();Kanboard.SetStorageItem(d(),
 "expanded")});$(".filter-collapse-link").click(function(a){a.preventDefault();e();Kanboard.SetStorageItem(d(),"collapsed")});k()}function d(){return"board_stacking_"+$("#board").data("project-id")}function e(){$(".filter-collapse").hide();$(".task-board-collapsed").show();$(".filter-expand").show();$(".task-board-expanded").hide()}function f(){$(".filter-collapse").show();$(".task-board-collapsed").hide();$(".filter-expand").hide();$(".task-board-expanded").show()}function k(){"expanded"===(Kanboard.GetStorageItem(d())||
--- a/assets/js/src/base.js
+++ b/assets/js/src/base.js
@ -46,7 +46,7 @@ var Kanboard = (function() {
                $("#popover-content").click(function(e) {
                    e.stopPropagation();
                });
-                
+
                $(".close-popover").click(function(e) {
                    e.preventDefault();
                    $('#popover-container').remove();
@ -184,10 +184,10 @@ var Kanboard = (function() {
            $(".file-popover").click(Kanboard.Popover);

            // Keyboard shortcuts
-            Mousetrap.bind("ctrl+enter", function() {
+            Mousetrap.bind("mod+enter", function() {
                $("form").submit();
            });
-            
+
            // Tooltip for column description
            $(".column-tooltip").tooltip({
                content: function(e) {
@ -201,7 +201,7 @@ var Kanboard = (function() {
        },

        InitAfterAjax: function() {
-            
+
            // Datepicker
            $(".form-date").datepicker({
                showOtherMonths: true,
--- a/tests/units/TaskCreationTest.php
+++ b/tests/units/TaskCreationTest.php
@ -93,8 +93,8 @@ class TaskCreationTest extends Base
        $this->assertEquals('', $task['description']);
        $this->assertEquals('', $task['reference']);

-        $this->assertEquals(time(), $task['date_creation']);
-        $this->assertEquals(time(), $task['date_modification']);
+        $this->assertEquals(time(), $task['date_creation'], 'Wrong timestamp', 1);
+        $this->assertEquals(time(), $task['date_modification'], 'Wrog timestamp', 1);
        $this->assertEquals(0, $task['date_due']);
        $this->assertEquals(0, $task['date_completed']);
        $this->assertEquals(0, $task['date_started']);