diff --git a/assets/css/app.css b/assets/css/app.css index 1d2d4be3a..5dedf33be 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -52,7 +52,8 @@ h1, h2, h3 { } h2 { - font-size: 1.6em; + font-size: 1.3em; + margin-bottom: 10px; } h3 { @@ -112,7 +113,7 @@ td li { form { padding: 10px; margin-bottom: 20px; - background: #fcfcfc; + background: #fafafa; border: 1px solid #eee; border-radius: 5px; } @@ -645,6 +646,32 @@ article .task-score { padding: 10px; } +.task-show { + position: relative; +} + +.task-show-main { + margin-left: 330px; +} + +.task-show-sidebar { + position: absolute; + left: 0px; + top: 0; + width: 250px; + padding: 10px; + padding-top: 0; + border: 1px solid #ccc; + background: #f0f0f0; + border-radius: 5px; +} + +.task-show-sidebar li { + list-style-type: square; + margin-left: 30px; + line-height: 1.8em; +} + /* markdown content */ .markdown { line-height: 1.4em; diff --git a/locales/es_ES/translations.php b/locales/es_ES/translations.php index e101c7ce8..4d2a606fb 100644 --- a/locales/es_ES/translations.php +++ b/locales/es_ES/translations.php @@ -112,8 +112,8 @@ return array( 'Column on the board:' => 'Columna en el tablero: ', 'Status is open' => 'Estado abierto', 'Status is closed' => 'Estado cerrado', - 'close this task' => 'cerrar esta tarea', - 'open this task' => 'abrir esta tarea', + 'Close this task' => 'Cerrar esta tarea', + 'Open this task' => 'Abrir esta tarea', 'There is no description.' => 'No hay descripción.', 'Add a new task' => 'Añadir una nueva tarea', 'The username is required' => 'El nombre de usuario es obligatorio', diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php index a77a5f571..cf6764407 100644 --- a/locales/fr_FR/translations.php +++ b/locales/fr_FR/translations.php @@ -112,8 +112,8 @@ return array( 'Column on the board:' => 'Colonne sur le tableau : ', 'Status is open' => 'État ouvert', 'Status is closed' => 'État fermé', - 'close this task' => 'fermer cette tâche', - 'open this task' => 'ouvrir cette tâche', + 'Close this task' => 'Fermer cette tâche', + 'Open this task' => 'Ouvrir cette tâche', 'There is no description.' => 'Il n\'y a pas de description.', 'Add a new task' => 'Ajouter une nouvelle tâche', 'The username is required' => 'Le nom d\'utilisateur est obligatoire', diff --git a/locales/pl_PL/translations.php b/locales/pl_PL/translations.php index 0b6d84807..2a2ddbd85 100644 --- a/locales/pl_PL/translations.php +++ b/locales/pl_PL/translations.php @@ -112,8 +112,8 @@ return array( 'Column on the board:' => 'Kolumna na tablicy:', 'Status is open' => 'Status otwarty', 'Status is closed' => 'Status zamknięty', - 'close this task' => 'zamknij zadanie', - 'open this task' => 'otwórz zadanie', + 'Close this task' => 'Zamknij zadanie', + 'Open this task' => 'Otwórz zadanie', 'There is no description.' => 'Brak opisu.', 'Add a new task' => 'Dodaj zadanie', 'The username is required' => 'Nazwa użytkownika jest wymagana', diff --git a/locales/pt_BR/translations.php b/locales/pt_BR/translations.php index b9d273a09..9c740bf7c 100644 --- a/locales/pt_BR/translations.php +++ b/locales/pt_BR/translations.php @@ -112,8 +112,8 @@ return array( 'Column on the board:' => 'Coluna no quadro:', 'Status is open' => 'Status está aberto', 'Status is closed' => 'Status está fechado', - 'close this task' => 'fechar esta tarefa', - 'open this task' => 'abrir esta tarefa', + 'Close this task' => 'Fechar esta tarefa', + 'Open this task' => 'Abrir esta tarefa', 'There is no description.' => 'Não há descrição.', 'Add a new task' => 'Adicionar uma nova tarefa', 'The username is required' => 'O nome de usuário é obrigatório', diff --git a/templates/task_show.php b/templates/task_show.php index 1ec9a22c5..eaabdfb1a 100644 --- a/templates/task_show.php +++ b/templates/task_show.php @@ -3,108 +3,120 @@

# -

-
-

-
- - - - -
+
-

- -
- +
+ +

+
+
    +
  • +
  • +
  • + + + + + +
  • +
+
+
+ +
+

+
+ + + +
    +
  • + +
  • + +
  • + +
  • + + +
  • + +
  • + +
  • + + + + + + + +
  • +
  • + + + () +
  • +
  • + + + + + +
  • +
- -
- -
+

+ +
+ +
+ + + + +
+
+ +
+ +
+
+ + +

+ +
    + + $comment, + 'task' => $task, + 'display_edit_form' => $comment['id'] == $comment_edit_form['values']['id'], + 'values' => $comment_edit_form['values'] + array('comment' => $comment['comment']), + 'errors' => $comment_edit_form['errors'] + )) ?> + +
+ + + +
+ + + +
- +
- + -

- -
    - - $comment, - 'task' => $task, - 'display_edit_form' => $comment['id'] == $comment_edit_form['values']['id'], - 'values' => $comment_edit_form['values'] + array('comment' => $comment['comment']), - 'errors' => $comment_edit_form['errors'] - )) ?> - -
- +
- -
- - - -
-
- -
- -
-
-