wip

template/module/journey/map.pug

@@ -17,5 +17,5 @@ l-map(
   include map/restaurants.pug
 
   include map/travel.pug
-
-  include map/right_menu.pug
+  template(v-if="edit_active")
+    include map/right_menu.pug

template/module/view/nav.pug

@@ -1,11 +1,10 @@
-header.header
-  .header-inner.container
-    .input.input-invis
-      input.small(:value="journey.data.name", type="text", disabled="")
-    .row.header-nav.text-big(style="margin-bottom: 0")
-      .col-sm-3
-        a(:href="'/short/' + journey.id")
-          i.fas.fa-file-contract
-      .col-sm-3
-        a(:href="'/view/' + journey.id")
-          i.fas.fa-camera
+.row.fleft(style="position:absolute;right:0;")
+  .col-1
+    a(:href="'/short/' + journey.id")
+      i.fas.fa-file-contract
+  .col-1
+    a(:href="'/view/' + journey.id")
+      i.fas.fa-camera
+  //- .col-1
+  //-   a(:href="'/' + journey.id" v-on:click.prevent="first_step")
+  //-     i.fas.fa-tools

template/module/view/short_leg.pug

@@ -1,37 +1,39 @@
-.container.section
-  .row.text-center
-    .input.col-sm-2
-      input(disabled="", :value="item.title")
-    .input.col-sm-4
+.col-11.container.section
+  .row.text-center.align.padding-1
+    .input.col-5.col-sm-2
+      input(disabled="", placeholder="Unnamed" :value="item.title")
+    .col-sm-1
+    .input.col-6.col-sm-4
       input(
         disabled="",
         placeholder="No Dates",
-        :value="item.date_range ? format_date(item.date_range[0]) + ' - ' + format_date(item.date_range[1]) : ''"
+        :value="item.date_range ? item.date_range[0].toLocal() + ' - ' + item.date_range[1].toLocal() : ''"
       )
-    .input.col-sm-2
-      input(disabled="", placeholder="No Hotel", :value="item.hotel.sname")
-  .row.text-center
-    .input.col-sm-3(v-if="item.transit")
-      div(v-for="(item, idx) in item.transit")
-        input(disabled="", :value="item.map((v) => v.id).join(', ')")
-  .row.text-center
-    .input.col-sm-8(v-if="item.places && item.places.restaurants")
+    .col-1.col-sm-2
+    .input.col-5.col-sm-3.text-dark
+      .text(disabled="" placeholder="No Hotel" :value="item.hotel?item.hotel.sname:''") {{item.hotel?item.hotel.sname:'No Hotel'}}
+  //- .row.text-center
+    .input.col-sm-3(v-if="item.travel")
+      div(v-for="(item, idx) in item.travel")
+        input(disabled="", placeholder="-" :value="item.map((v) => v.id).join(', ')")
+  .row.align.padding-1
+    .input.col-sm-10.text-dark
       .text-small(
         placeholder="No Restaurants",
-        :value="item.places.restaurants.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ')",
+        :value="item.places.restaurants.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ') || 'No Restaurants'",
         disabled=""
-      )
-  .row.text-center
-    .input.col-sm-8(v-if="item.places && item.places.activities")
+      ) {{item.places.restaurants.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ') || 'No Restaurants'}}
+  .row.align.padding-1
+    .input.col-sm-10.text-dark
       .text-small(
         placeholder="No Activities",
-        :value="item.places.activities.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ')",
+        :value="item.places.activities.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ') || 'No Activites'",
         disabled=""
-      )
-  .row.text-center
-    .input.col-sm-8(v-if="item.notes")
+      ) {{item.places.activities.map((v) => v.sname + (v.notes ? '(' + v.notes + ')' : '')).join(', ') || 'No Activites'}}
+  .row.align.padding-1
+    .input.col-sm-10.text-dark
       .text-small(
         placeholder="No Notes",
-        :value="item.notes",
+        :value="item.notes || 'No Notes'",
         disabled=""
-      )
+      ) {{item.notes || 'No Notes'}}

template/module/view/view_day.pug

@@ -1,19 +1,19 @@
 div(v-for="(e, idx) in journey.data.main", :key="idx")
   .bg-dark.text-white(v-if="journey.sel_leg == idx")
     .container.section
-      .aligner.text-center.text-white.text-huge(style="margin-bottom: 5px")
-        .aligner--itemTop.fleft
-          a(href="#prev", v-on:click.prevent="journey.day_prev()")
+      .row
+        .col-3.fleft.text-center.text-white.text-huge
+          a(v-on:click.prevent="journey.day_prev()")
             i.fas.fa-angle-left
-        span.container
+        .col-6.container.text-center.align
           span.small {{ journey.data.main[idx].title }} {{ journey.sel_day }}
           .text-big.text-gray {{ journey.data.main[idx].day_title[journey.sel_day] }}
-        .aligner--itemEnd.fright
-          a(href="#next", v-on:click.prevent="journey.day_next()")
+        .col-3.fright.text-center.text-white.text-huge
+          a(v-on:click.prevent="journey.day_next()")
             i.fas.fa-angle-right
       .row
-        .col-12.col-sm-12
-          include map.pug
+        .col-12.col-sm-12(style="aspect-ratio:1.25;")
+          include ../journey/map.pug
       .row
-        .col-12.col-sm-12
-          .container
+        .col-10
+          span.small.text-gray {{journey.data.main[idx].note || '...'}}