ish_manager 0.1.8.315 → 0.1.8.317

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2004c1173de616a39ef2d2b185f1bd906a30dea6a77989847d549e976284f36a
-  data.tar.gz: b6d799d9a77d78a2db6cb591ab0e836e5aed4e17c9c2b85901bee69c7b1be328
+  metadata.gz: 46aac642f2935fba5fd3fbdde3b5c8db3d5de1e662548ade2034e92b9139a85b
+  data.tar.gz: bca3a8046029e062114dd953e3c176bfca6b1bd707af2884a40005eae3f3245c
 SHA512:
-  metadata.gz: 3246003592e1c7e17a696cc2036007fd8f680349947d1477a698aae7ab824339e18e2990bd3a04e0bf06fda8cf0d4e2491bd66b2c5c38a9e7f2eedc1b4c8c1bb
-  data.tar.gz: 03063e33940ecced352f7fa41ea2fe60e60a984f686863cde1d52b86062d9120d9a31095369c206eeb77dcebbc3fa20fa0a265db227c07aa1c39380b00262f05
+  metadata.gz: c272991b54c0d0e841e01df392da16147210066e95fff67c680f9c80f95da58924b4cc15e98ff8024d2c0ce939bd358f5375e08dffd0aa34149f1f0ea6c27d4a
+  data.tar.gz: fb6f0a1676f62df1719a529d64804fa17b163ab82aa6000e8855e9e6e069ef6a6a98d7c4d7d2da0e1791b64009bfb56ad97b4d1479f33340c0587d8a8826dfb1

data/app/assets/javascripts/ish_manager/application.js

@@ -90,10 +90,6 @@ $(function () {
     })
   }
 
-  $(".addToggle").on('click', function () {
-    $(this).next().toggle(500)
-  })
-
   if ('function' === typeof $('body').datepicker) {
     $(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' })
   }

data/app/assets/stylesheets/ish_manager/application.scss

@@ -1,45 +1,32 @@
 /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- * alphabetized : )
+ * Alphabetized : )
  *
+ *= require ish_manager/jquery-ui
  *= require_self
  *
- ** Utils
- ** Newsitems
- ** Reports
+ * includes email contexts:
+ *= require ish_manager/email_templates
  *
  *= require ish_manager/galleries
- *= require ish_manager/jquery-ui
  *= require ish_manager/maps
+ *= require ish_manager/markers
  *= require ish_manager/leads
  *= require ish_manager/photos
  *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos
  *= require ish_manager/pagination
- */
-
-
-
-/*
- * Utils
 **/
 
+
 body {
   background: #dedede;
   font-size: 20px;
 }
-
+hr {
+  background: red;
+  height: 1px !important;
+}
 pre {
   background: #e0e0e0;
   padding: 1em;
@@ -53,34 +40,12 @@ ul:not(.browser-default).bullets, {
   }
 }
 
-.-index {
-  .item {
-    margin-bottom: 3em;
-  }
-
-  /* clear nth! */
-  .row div:nth-child(2n+1) {
-    clear:left
-  }
-
-  .row h3 {
-    margin-bottom: 0;
-  }
-}
-
-
-
 
 /* A */
 
-.addToggle::after {
+.collapse-expand::after {
   content: " [<>]";
 }
-.addToggle {
-  + * {
-    display: none;
-  }
-}
 .alert {
   border: 1px solid red;
   padding: .8em;
@@ -125,6 +90,10 @@ ul:not(.browser-default).bullets, {
 
 /* C */
 
+.c {
+  clear: both;
+}
+
 .Card {
   border: 1px solid gray;
   border-radius: 8px;
@@ -136,18 +105,20 @@ ul:not(.browser-default).bullets, {
   text-align: center;
 }
 
-.c {
-  clear: both;
-}
-
 .collapse-expand {
   cursor: pointer;
 }
-#collapseFooter {
-  float: left;
-}
 
 /* D */
+
+.descr,
+.description {
+  border: 1px solid red;
+  padding: 1em;
+  font-size: 1.6em;
+}
+
+
 /* E */
 .error_explanation {
   border: 1px solid red;
@@ -156,49 +127,29 @@ ul:not(.browser-default).bullets, {
 
 /* F */
 
-.--form {
-  margin-bottom: 2em;
-}
-
-.flat-row {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-content: flex-start;
-
-  height: 2.4em;
-  line-height: 3em;
-
-  width: 100%;
-  margin: 1em 0 0 0;
-  padding: 0;
-
-  > * {
-    padding-right: 1em;
-  }
-}
-
-
 .flex-row {
   display: flex;
-  flex-wrap: wrap; /* @TODO: why does it wrap? in ish_manager/show , I'd prefer it didn't. */
-
+  flex-wrap: wrap;
+  > div {
+    margin-right: 10px;
+  }
+  > div:last-child {
+    margin-right: 0;
+  }
 }
 
 .float-left {
   float: left;
   padding-right: 1em;
 }
+
 .float-right {
   float: right;
 }
-hr {
-  background: red;
-  height: 1px !important;
-}
+
 
 /* I */
-img .img-400 {
+img.img-400 {
   width: 400px;
 }
 
@@ -208,13 +159,20 @@ img .img-400 {
 }
 ul.inline li {
   display: inline;
+  padding-right: 1em;
 }
+
 .inline-search {
-  width: 20px;
-  bordeR: 1px solid white;
+  border: 1px solid white;
   display: inline-block;
+  width: 20px;
+
+  input[type='text'] {
+    width: 20px;
+  }
 }
 
+
 /* L */
 textarea.large {
   height: 400px;
@@ -227,7 +185,7 @@ textarea.large {
 /* M */
 
 
-.manager--main-header {
+.main-header {
   background: url('/assets/bg/weather.png');
 
   a {
@@ -239,35 +197,34 @@ textarea.large {
     margin-top: 0;
   }
 
-  ul {
-    li {
-      display: inline;
-      padding: 1em;
-    }
-  }
 
-}
 
+  ul {
+    margin: 0;
+    padding: 0;
+    display: flex;
+    flex-wrap: wrap;
 
-.manager--main-header.development,
-.manager--main-header.development_production {
-  background: url('/assets/bg/weather-development.png');
-}
+    li {
+      margin: 0 0 10px 0;
+      display: inline-block;
+      min-width: 200px;
 
-.manager-galleries--index .mini {
-  float: left;
+      > div { /* for example .galleries--menu */
+        display: inline-block;
+      }
+    }
+  }
 }
-
-.manager-sites--title {
-  padding: 1em;
-  background: url('/assets/bg/weather.png');
-  border-bottom: 1px solid red;
+@media only screen and (max-width: 400px) {
+  .main-header ul li {
+    min-width: 45vw;
+  }
 }
 
-.markers--form .row {
-  margin-bottom: 1em;
-  padding-bottom: 1em;
-  border-bottom: 1px solid blue;
+.main-header.development,
+.main-header.development_production {
+  background: url('/assets/bg/weather-development.png');
 }
 
 .menu-secondary {
@@ -279,6 +236,11 @@ textarea.large {
       background: white;
     }
   }
+
+  li.active a {
+    border-bottom: 5px solid black;
+  }
+
 }
 
 .meta-edit {
@@ -287,6 +249,11 @@ textarea.large {
 
 /* N */
 
+.newsitems--item {
+  border: 1px solid green;
+  padding: 5px;
+}
+
 .notice {
   border: 1px solid green;
   padding: .8em;
@@ -297,28 +264,6 @@ textarea.large {
   padding: .5em;
 }
 
-/* S */
-.small {
-  font-size: .8em;
-}
-
-.thumb {
-  background: dedede;
-  border: 1px solid red;
-  width: 100px;
-  height: 100px;
-}
-ul.inline li {
-  padding-right: 1em;
-}
-
-
-
-.youtube_img {
-  width: 100px;
-}
-
-
 /* R */
 .red-border {
   border: 1px solid red;
@@ -326,38 +271,32 @@ ul.inline li {
 }
 
 /* S */
+
 .select2-container {
   max-width: 100%;
   display: block;
 }
 
+.small {
+  font-size: .8em;
+}
+
 /* T */
 
+.thumb {
+  background: dedede;
+  border: 1px solid red;
+  width: 100px;
+  height: 100px;
+}
+
 /* U */
 
 /* V */
 
 /* W */
 
-/*
- * Newsitems
-**/
-.newsitems--item {
-  border: 1px solid green;
-  padding: 5px;
-}
-
-.menu-secondary li.active a {
-  border-bottom: 5px solid black;
+.youtube_img {
+  width: 100px;
 }
 
-
-/**
- * Reports
-**/
- .descr,
- .description {
-   border: 1px solid red;
-   padding: 1em;
-   font-size: 1.6em;
- }

data/app/assets/stylesheets/ish_manager/email_templates.scss

@@ -0,0 +1,47 @@
+
+
+.email-contexts-new {
+  .actions {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+
+.email-contexts-show {
+
+  iframe {
+    min-height: 500px;
+  }
+
+}
+
+.email-templates-index ul li,
+.email-contexts-index {
+
+   a {
+    margin-right: 0.5em;
+
+    &::before {
+      content: "[";
+    }
+
+    &::after {
+      content: "]";
+    }
+  }
+
+}
+
+.email-templates--form {
+  border: 1px solid red;
+  padding: 1em;
+
+  form {
+    display: flex;
+
+    > * {
+      padding-right: 20px;
+    }
+  }
+
+}

data/app/assets/stylesheets/ish_manager/galleries.scss

@@ -1,28 +1,44 @@
-/* utils */
 
-.row-thumbs .item {
-  margin-bottom: 1em;
-  border: 1px solid red;
-  padding: 10px;
-  img {
-    margin-top: 10px;
-  }
+
+.galleries--index .mini {
+  float: left;
 }
 
-.row-large .item {
-  border: 1px solid red;
-  display: block;
+.galleries--title {
+  text-align: center;
+}
 
-  padding: 10px;
-  margin: 10px;
+.galleries-show {
+  .row {
+    display: block;
+    border-bottom: 2px solid red;
 
-  height: 90vh;
-  max-width: 100vw;
+  }
 
-  .goto {
+  .row-large .goto {
     display: none;
   }
 
+}
+
+
+// .row-thumbs .item {
+//   margin-bottom: 1em;
+//   img {
+//     margin-top: 10px;
+//   }
+// }
+
+.row-large .item {
+  border: 1px solid red;
+
+  display: block;
+  margin-bottom: 1em;
+  max-height: 95vh;
+  padding: 10px;
+  padding-bottom: 50px;
+  background: #cecece;
+
   .wrapper {
     width: 100%;
     height: 80vh;

data/app/assets/stylesheets/ish_manager/maps.scss

@@ -1,13 +1,30 @@
-/**
- * utils first
- */
+/*
+ * Alphabetized : )
+**/
+
+
+.flat-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-content: flex-start;
+
+  height: 2.4em;
+  line-height: 3em;
+
+  width: 100%;
+  margin: 1em 0 0 0;
+  padding: 0;
+
+  > * {
+    padding-right: 1em;
+  }
+}
+
 .red-cross {
   position: absolute;
 }
 
-/*
- * Main - Maps
- */
 .maps--map-meta-row {
   border-left: 10px solid #e3e3e3;
   padding-left: 10px;
@@ -19,11 +36,6 @@
 
 .maps-index {
 
-  // h1 {
-  //   padding-bottom: 10px;
-  //   border-bottom: 10px solid #cecece;
-  // }
-
   .item {
     display: flex;
     flex-direction: row;
@@ -56,6 +68,27 @@
   }
 }
 
+
+.maps-map-editor {
+  .map-editor {
+    border: 1px solid red;
+    position: relative;
+
+    .marker {
+      position: absolute;
+      top: 0;
+      left: 0;
+
+      border: 1px solid yellow;
+    }
+  }
+  .markers-list {
+    .item {
+      border: 1px solid green;
+    }
+  }
+}
+
 .maps-show {
   .the-map {
     position: relative;
@@ -81,24 +114,4 @@
 
 
   }
-}
-
-.maps-map-editor {
-  .map-editor {
-    border: 1px solid red;
-    position: relative;
-
-    .marker {
-      position: absolute;
-      top: 0;
-      left: 0;
-
-      border: 1px solid yellow;
-    }
-  }
-  .markers-list {
-    .item {
-      border: 1px solid green;
-    }
-  }
-}
+}

data/app/assets/stylesheets/ish_manager/markers.scss

@@ -0,0 +1,8 @@
+
+
+.markers--form .row {
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+  border-bottom: 1px solid blue;
+}
+

data/app/assets/stylesheets/ish_manager/photos.scss

@@ -1,12 +1,49 @@
 
-.--meta-manager {
+.photos--index-mini {
+}
+.photos--index-thumbs {
+  .item {
+    border: 1px solid red;
+    padding: 10px;
+
+    max-width: Min(125px, 30vw);
+  }
+}
+.photos--meta-manager {
   display: flex;
   justify-content: space-between;
 
+  .right-hand {
+    text-align: right;
+  }
   .right-hand a {
+
   }
-  .right-hand a:not(:last-child):after {
+  .right-hand a:not(:first-child):before {
     content: "|";
     padding: 0 10px 0 15px;
   }
 }
+.photos--multinew {
+  border: 1px dashed #356;
+  display: inline-block;
+  margin-bottom: 2em;
+  padding: 10px;
+
+  input[type='file'] {
+    overflow-x: auto;
+    max-width: Max( 300px, 50vw );
+  }
+}
+
+.row-deleted {
+  .goto,
+  .x {
+    display: none;
+  }
+}
+.row-mini {
+  .flex-row {
+    margin-bottom: 500px;
+  }
+}

data/app/controllers/ish_manager/{campaigns_controller.rb → email_campaigns_controller.rb}

@@ -1,5 +1,5 @@
 
-class IshManager::CampaignsController < IshManager::ApplicationController
+class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Ish::Campaign