From 48d3b57503728c1e194ce7e15744bf053b51f3d6 Mon Sep 17 00:00:00 2001 From: Alyona Date: Wed, 26 Sep 2018 16:04:31 +0400 Subject: [PATCH 1/5] add paper page --- src/main/resources/templates/paper.html | 15 ++++++++------- src/main/resources/templates/papers.html | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/resources/templates/paper.html b/src/main/resources/templates/paper.html index e5cf10e..489c28e 100644 --- a/src/main/resources/templates/paper.html +++ b/src/main/resources/templates/paper.html @@ -11,17 +11,17 @@ NG-Tacker - + - - - - - + + + + + - + @@ -88,6 +88,7 @@ + diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html index 81b6952..7d8a446 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers.html @@ -12,6 +12,7 @@

Статьи

+

Страница редактирования статьи
From 5b16ac785c859a6139173fddb2747d16297fc5cb Mon Sep 17 00:00:00 2001 From: Alyona Date: Wed, 26 Sep 2018 16:41:33 +0400 Subject: [PATCH 2/5] Merge branch 'master' into 23-dashboard # Conflicts: # src/main/resources/templates/papers.html --- src/main/resources/templates/paper.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/paper.html b/src/main/resources/templates/paper.html index 489c28e..7e33073 100644 --- a/src/main/resources/templates/paper.html +++ b/src/main/resources/templates/paper.html @@ -3,10 +3,10 @@ - - - - + + + + NG-Tacker @@ -56,6 +56,7 @@ +
@@ -78,7 +79,7 @@
- +

@@ -88,6 +89,9 @@ +
From f9f287c190ac96a3efba20b8cee8c67d81c47f52 Mon Sep 17 00:00:00 2001 From: Elena Date: Thu, 4 Oct 2018 10:39:27 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=20?= =?UTF-8?q?=E2=84=965?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/paper.html | 34 +++++++++++++++++++++--- src/main/resources/templates/papers.html | 2 +- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/paper.html b/src/main/resources/templates/paper.html index 7e33073..6f76622 100644 --- a/src/main/resources/templates/paper.html +++ b/src/main/resources/templates/paper.html @@ -68,9 +68,7 @@
- +
@@ -79,9 +77,34 @@
- +

+
+
+ +
+
+ Завершена + Черновик + Внимание +
+
+ + +
+
+
+ +
+
+
+ + +
+
@@ -92,6 +115,9 @@ +
diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html index 7d8a446..56fec21 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers.html @@ -12,7 +12,7 @@
From 31c7c8571ed0e151e375339724239293262a1caa Mon Sep 17 00:00:00 2001 From: Elena Date: Wed, 10 Oct 2018 15:30:47 +0400 Subject: [PATCH 4/5] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=20?= =?UTF-8?q?=E2=84=965=20new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/paper.html | 146 ----------------- src/main/resources/templates/papers.html | 44 ----- .../resources/templates/papers/paper.html | 150 +++++++++++++++++- .../resources/templates/papers/papers.html | 2 +- 4 files changed, 150 insertions(+), 192 deletions(-) delete mode 100644 src/main/resources/templates/paper.html delete mode 100644 src/main/resources/templates/papers.html diff --git a/src/main/resources/templates/paper.html b/src/main/resources/templates/paper.html deleted file mode 100644 index 6f76622..0000000 --- a/src/main/resources/templates/paper.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - NG-Tacker - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-

Редактирование статьи

-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -

-
-
-
- -
-
- Завершена - Черновик - Внимание -
-
- - -
-
-
- -
-
-
- - -
-
-
-
-
-
- - - - -
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html deleted file mode 100644 index 56fec21..0000000 --- a/src/main/resources/templates/papers.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - -
-
-
-
-
-

Статьи

-

Добавить статью

 -
-
-
-
- - - - - - - - - - - - - - - - - -
- - - diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html index 5445639..ba8a1af 100644 --- a/src/main/resources/templates/papers/paper.html +++ b/src/main/resources/templates/papers/paper.html @@ -1,3 +1,4 @@ + + + + + + + + + + + + NG-Tacker + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+

Редактирование статьи

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

+
+
+
+ +
+
+ Завершена + Черновик + Внимание +
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+
+
+ + + + +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html index a7eeda2..3a3a7cc 100644 --- a/src/main/resources/templates/papers/papers.html +++ b/src/main/resources/templates/papers/papers.html @@ -13,7 +13,7 @@

Статьи

Перейти на тестовую страницу Алёны
 -

Ссылка на пустую страницу

 +

Добавить статью
From 0219b0ce28439d75ad3b1804d739e01d5eab9248 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Wed, 10 Oct 2018 17:05:54 +0400 Subject: [PATCH 5/5] fix paper view --- .../resources/templates/papers/paper.html | 198 +++++------------- 1 file changed, 47 insertions(+), 151 deletions(-) diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html index ba8a1af..e3ae274 100644 --- a/src/main/resources/templates/papers/paper.html +++ b/src/main/resources/templates/papers/paper.html @@ -1,4 +1,3 @@ - - - - - - - - - - - - NG-Tacker - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-

Редактирование статьи

-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -

-
-
-
- -
-
- Завершена - Черновик - Внимание -
-
- - -
-
-
- -
-
-
- - -
-
-
-
-
-
- - - - -
-
-
-
-
-
-
- - - - - - - - - - - - - -