User Story #1569 Создать режим "Редактировать"

При выборе переключателя "Редактировать" на странице становятся доступными для редактирования поля пояснений и поле "Рекомендации". Под полем рекомендации появляется кнопка "Сохранить" (при этом не появляется псевдоссылка "Сбросить"), при нажатии на кнопку происходит сохранение внесенных изменений и возврат в состояние страницы по умолчанию.
btbroot · Aug 9, 2013 · 38acd2e · 38acd2e
1 parent ad58e59
commit 38acd2e
Show file tree

Hide file tree

Showing 12 changed files with 977 additions and 714 deletions.
diff --git a/exmo/COPYING b/exmo/COPYING
@@ -345,6 +345,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 --
 
+exmo/scores/static/js/jquery.autosize.js
+
+Autosize 1.15.2 - jQuery plugin for textareas
+
+The MIT License (MIT)
+
+Copyright (c) 2012 Jack Moore - jacklmoore.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+--
+
 exmo/exmo2010/static/exmo2010/ckeditor/
 
 Copyright (C) 2003 - 2013 CKSource - Frederico Knabben

diff --git a/exmo/static/exmo2010/css/score.css → exmo/scores/static/css/score.css b/exmo/static/exmo2010/css/score.css → exmo/scores/static/css/score.css
@@ -19,52 +19,12 @@
 #
 */
 
-/* Parameter */
-
-.table-parameter
-{
-    margin-bottom: 20px;
-    border-spacing: 0;
-    border-collapse: separate;
-    *border-collapse: collapse;
-    border: #fff 1px solid;
+form.score {
+    float: left;
+    display: block;
     width: 100%;
 }
 
-.table-parameter th
-{
-    padding: 8px 12px;
-    background-image: none;
-    background-color: transparent;
-    border-bottom: #fff 1px solid;
-    border-left: #bbb 1px solid;
-    color: #333;
-}
-
-.table-parameter td
-{
-    padding: 8px 12px;
-    border-left: #bbb 1px solid;
-    border-top: #bbb 1px solid;
-    border-bottom: #fff 1px solid;
-}
-
-.table-parameter td:first-child
-{
-    border-left: #fff 1px solid;
-}
-
-.table-parameter .value
-{
-    width: 80px;
-    text-align: center;
-}
-
-.table-parameter .criteria
-{
-    width: 20%;
-}
-
 .heading-comments-parameter
 {
     margin-top: 34px;
@@ -282,3 +242,57 @@ form.score {
 {
     background-color: #FFFFD6;
 }
+
+.button-bar {
+    padding-left: 15px;
+}
+
+.non-relevant-button {
+    float: right;
+}
+
+.non-relevant-button input {
+    background-color: #ffd8dd;
+    background-image: none;
+}
+
+.reset-button {
+    border: 1px solid #fff;
+    border-bottom: 1px dotted;
+    padding: 0;
+}
+
+.reset-button input {
+    cursor: pointer;
+    color: #005C9C;
+    background-color: transparent;
+    border: none;
+    margin: 0;
+    padding: 0;
+}
+
+.reset-button input:hover {
+    color: #005580;
+}
+
+h1 {
+    margin-bottom: 7px;
+}
+
+.recomendation-container {
+    padding-right: 7px;
+}
+
+#id_score-comment {
+    width: 100%;
+    resize: none;
+}
+
+.recomendation {
+    color: #333;
+    font-size: 13px;
+}
+
+#non_editable_table {
+    margin-top: 20px;
+}
diff --git a/...2010/css/score_list-parameter-colours.css → ...atic/css/score_list-parameter-colours.css b/...2010/css/score_list-parameter-colours.css → ...atic/css/score_list-parameter-colours.css
diff --git a/exmo/static/exmo2010/css/score_messages.css → exmo/scores/static/css/score_messages.css b/exmo/static/exmo2010/css/score_messages.css → exmo/scores/static/css/score_messages.css
diff --git a/exmo/scores/static/css/tables.css b/exmo/scores/static/css/tables.css
@@ -0,0 +1,103 @@
+/*
+# This file is part of EXMO2010 software.
+# Copyright 2010, 2011, 2013 Al Nikolov
+# Copyright 2010, 2011 non-profit partnership Institute of Information Freedom Development
+# Copyright 2012, 2013 Foundation "Institute for Information Freedom Development"
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+*/
+
+/* Non-editable table, Partially editable table and Editable table */
+
+.score-table {
+    margin-bottom: 20px;
+    border-spacing: 0;
+    border-collapse: separate;
+    *border-collapse: collapse;
+    border: #fff 1px solid;
+    width: 100%;
+}
+
+.score-table label {
+    color: #333;
+}
+
+.score-table th {
+    padding: 8px 12px;
+    background: none, transparent;
+    border-bottom: #fff 1px solid;
+    border-left: #bbb 1px solid;
+    color: #333;
+}
+
+.score-table td {
+    padding: 8px 12px;
+    height: 22px;
+    border-left: #bbb 1px solid;
+    border-top: #bbb 1px solid;
+    border-bottom: #fff 1px solid;
+}
+
+.score-table td:first-child {
+    border-left: #fff 1px solid;
+}
+
+.criteria {
+    width: 165px;
+}
+
+.score-table textarea {
+    height: 1.2em;
+    resize: none;
+    width: 99%;
+    margin: 0;
+    color: #333;
+}
+
+/* Non-editable table and Partially editable table */
+
+.non-editable .value, .partially-editable .value {
+    width: 80px;
+    text-align: center;
+}
+
+/* Editable table */
+
+.editable .value {
+    width: 170px;
+    padding: 0 14px;
+    white-space: nowrap;
+}
+
+.editable .value ul {
+    list-style: none;
+    margin: 0;
+    padding: 7px 0;
+    position: relative;
+    top: 7px;
+    display: inline;
+    white-space:nowrap;
+}
+
+.editable .value ul li {
+    list-style: none;
+    display: inline;
+    padding-left: 20px;
+    padding-top: 4px;
+}
+
+.editable .value ul li:first-child {
+    padding-left: 0;
+}