From bc09c8f16726f520c116e158ef3390dc84736bd2 Mon Sep 17 00:00:00 2001 From: jpl Date: Thu, 13 Apr 2017 16:07:09 +0200 Subject: Refs #2982: starting with reactux integration --- .../time_tables/components/Metas.js | 56 +++++++++++++++------- app/views/time_tables/new.html.slim | 13 ++++- 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js index 3bb763c71..1440dcb1d 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js @@ -11,27 +11,47 @@ const reorderArray = (arr) =>{ const Metas = ({day_types}) => { day_types = reorderArray(day_types) return ( -
-

Metas

-
- {day_types.map((day, i) => -
-
- +
+
+
+ {/* comment (name) */} +
+ + {/* color */} +
+ + {/* tags */} +
+ + {/* day_types */} +
+ +
+
+ {day_types.map((day, i) => +
+
+ +
+
+ )}
- )} +
+
) } diff --git a/app/views/time_tables/new.html.slim b/app/views/time_tables/new.html.slim index bc15f7032..8770a59b2 100644 --- a/app/views/time_tables/new.html.slim +++ b/app/views/time_tables/new.html.slim @@ -1,3 +1,12 @@ -= title_tag t('time_tables.new.title') +/ PageHeader += pageheader 'map-marker', + t('time_tables.new.title'), + '', + '' -== render 'form' \ No newline at end of file +/ PageContent +.page_content + .container-fluid + .row + .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1 + == render 'form' -- cgit v1.2.3