fixed dependencie bug

gruntfile.js

@@ -28,7 +28,7 @@ module.exports = function(grunt) {
             options:{
                 paths : "src",
                 langs : ["en_US", "fr_CA"],
-                filters : function(env, options){
+                configureEnvironment : function(env, options){
                   env.addFilter('trans', function(str, obj) {
                     var lang = options.lang || 'en_US';
                     var locale = YAML.load('locales/'+lang+'.yml');
@@ -167,7 +167,7 @@ module.exports = function(grunt) {
                    {
                       expand: true,
                       cwd: "src/templates",
-                      src: ["**/index.html"],
+                      src: ["**/*.html","!**/_*.html"],
                       dest: "dist/templates/"+lang+"/",
                       ext: ".html"
                    }

locales/en_US.yml

@@ -1,2 +1,9 @@
+current_language: You are currently using en_US
 
-test_string: You are currently using en_US
+alert_text_1: You have <strong>1 free report</strong> remaining.
+alert_text_2: Add your credit card now to upgrade your account to a premium plan to ensure you don't miss out on any reports.
+alert_text_3: Thanks for choosing Acme Inc.
+
+
+action_text_1: Please confirm your email address by clicking the link below.
+action_text_2: We may need to send you critical information about our service and it is important that we have an accurate email address.

package.json

@@ -30,7 +30,7 @@
     "grunt-mocha-test": "^0.12.7",
     "grunt-nodemailer": "^0.3.0",
     "grunt-nunjucks": "^0.1.4",
-    "grunt-nunjucks-2-html": "^0.2.3",
+    "grunt-nunjucks-2-html": "git+https://[email protected]/posabsolute/grunt-nunjucks-2-html.git",
     "grunt-premailer": "^0.2.11",
     "grunt-sass": "^0.18.0",
     "jasmine-node": "^1.14.5",

readme.md

@@ -507,7 +507,7 @@ The api can send emails to a variety of SMTP services, MailGun, Mandrill, SendGr
 
 Example :
 ```javascript
-"POST /email/send"
+"POST /email"
 // Post data
 {
   "data" : {

src/css/3_generic/_ink.reset.scss

@@ -18,6 +18,11 @@ body{
   padding:0;
 }
 
+.noreset {
+  float: none;
+  display: inline;
+}
+
 .ExternalClass { 
   width:100%;
 } 
@@ -48,7 +53,9 @@ img {
   clear: both; 
   display: block;
 }
-
+.center-text{
+  text-align:center;
+}
 center {
   width: 100%;
   min-width: 580px;

src/css/6_components/_component.alert-header.scss

@@ -0,0 +1,34 @@
+.alert-system{
+
+}
+
+	.alert-container{
+		border-radius: 3px 3px 0 0;
+		border-top: 1px solid #e9e9e9;
+		border-left: 1px solid #e9e9e9;
+		border-right: 1px solid #e9e9e9;
+	}
+
+		.alert-content{
+		  font-size: 15px;
+		  color: #fff;
+		  font-weight: 500;
+		  padding:15px;
+		  text-align: center;
+		}
+
+
+
+	/* Theming */
+	.alert-container-success{
+		background:#20a536;
+	}
+	.alert-container-warning{
+		background:#ff9f00
+
+	}
+
+@media only screen and (max-width: 600px) {
+	font-size: 12px;
+}
+

src/css/6_components/_component.ink.button.scss

@@ -1,10 +1,12 @@
+//generic layout
 table.button,
 table.tiny-button,
 table.small-button,
 table.medium-button,
 table.large-button {
-  width: 100%;
   overflow: hidden;
+  margin:0 0px 10px 0!important;
+
 }
 
 table.button td,
@@ -17,46 +19,49 @@ table.large-button td {
   text-align: center;
   transition: background-color 0.5s ease;
   background: #2ba6cb;
-  border: 1px solid #2284a1;
   color: #ffffff;
-  padding: 8px 0;
+  padding: 0px 0;
+  border-radius: 3px;
 }
 
-table.tiny-button td {
+table.button td a{
+  font-size: 16px; 
+  font-family: Helvetica, Arial, sans-serif; 
+  color: #ffffff; 
+  text-decoration: none;
+  border-radius: 3px; 
+  padding: 12px 18px; 
+  border: 1px solid #2178cf; 
+  display: inline-block;
+  border-radius: 3px;
+}
+
+
+table.tiny-button td a{
   padding: 5px 0 4px;
 }
 
-table.small-button td {
-  padding: 8px 0 7px;
+table.small-button td a{
+  padding: 8px 7px 7px 7px;
+  font-size: 14px;
 }
 
-table.medium-button td {
+table.medium-button td a{
   padding: 12px 0 10px;
 }
 
-table.large-button td {
+table.large-button td a{
   padding: 21px 0 18px;
 }
 
-table.button td a,
-table.tiny-button td a,
-table.small-button td a,
-table.medium-button td a,
-table.large-button td a {
-  font-weight: bold;
-  text-decoration: none;
-  font-family: Helvetica, Arial, sans-serif;
-  color: #ffffff;
-  font-size: 16px;
-}
 
 table.tiny-button td a {
   font-size: 12px;
   font-weight: normal;
 }
 
 table.small-button td a {
-  font-size: 16px;
+
 }
 
 table.medium-button td a {
@@ -70,37 +75,44 @@ table.large-button td a {
 table.button:hover td,
 table.button:visited td,
 table.button:active td {
-  background: #2795b6 !important;
+  background: #2795b6;
 }
 
 table.button:hover td a,
 table.button:visited td a,
 table.button:active td a {
-  color: #fff !important;
+  color: #fff;
 }
 
 table.button:hover td,
 table.tiny-button:hover td,
 table.small-button:hover td,
 table.medium-button:hover td,
 table.large-button:hover td {
-  background: #2795b6 !important;
+  background: #2795b6;
 }
 
 table.button:hover td a,
 table.button:active td a,
-table.button td a:visited,
-table.tiny-button:hover td a,
-table.tiny-button:active td a,
-table.tiny-button td a:visited,
-table.small-button:hover td a,
-table.small-button:active td a,
-table.small-button td a:visited,
-table.medium-button:hover td a,
-table.medium-button:active td a,
-table.medium-button td a:visited,
-table.large-button:hover td a,
-table.large-button:active td a,
-table.large-button td a:visited {
-  color: #ffffff !important; 
+table.button td a:visited{
+  color: #ffffff; 
+}
+
+
+//themes
+table.btn-blue td,
+table.btn-blue td a{
+  background:#2178cf;
+}
+
+
+table.btn-blue td:hover,
+table.btn-blue td a:hover{
+  background:#1a68b6;
+  color:#fff!important;
+}
+table.btn-blue td a:active{
+  background:#1a68b6;
+  color:#fff!important;
+  box-shadow: inset 0 3px 5px rgba(0,0,0,.125);
 }

src/css/7_themes/transactional/_base.scss

@@ -0,0 +1,29 @@
+body,.body{
+	background:#f6f6f6;
+}
+
+.content-container {
+	background: #fff;
+  	border: 1px solid #e9e9e9;
+  	border-radius: 3px;
+}
+.no-radius{
+	border-radius:0px;
+	border-top: 0px;
+}
+.marg-btm-5{
+	padding-bottom:0px;
+	margin-bottom: 5px;
+}
+.title-hello{
+	margin-top:0;
+	padding-top:0;
+}
+.content-wrap {
+  padding: 20px;
+}
+
+ul{
+	  padding-left: 20px;
+	  margin-left:0;
+}

src/css/7_themes/transactional/_sections.footer.scss

@@ -0,0 +1,17 @@
+.footer-content{
+	color:#999;
+	font-size:12px;
+	a{
+		color:#999;
+		font-size:12px;
+	}
+}
+.footer-logo{
+	width:150px;
+	max-width:150px;
+	height:auto;
+}
+.footer-logo-container{
+	padding:10px 0;
+}
+

src/css/7_themes/transactional/_sections.header.scss

@@ -0,0 +1,11 @@
+.header-logo-container{
+	padding:10px 0 10px 0;
+	text-align:center;
+}
+.header-logo-retina{
+
+}
+
+.header-back-office-container{
+	padding: 0 0 10px 0;
+}

src/css/7_themes/transactional/_sections.invoices.scss

@@ -0,0 +1,24 @@
+
+
+/* -------------------------------------
+    INVOICE
+------------------------------------- */
+.invoice {
+  margin: 40px auto;
+  text-align: left;
+  width: 100%;
+}
+.invoice td {
+  padding: 5px 0;
+}
+.invoice .invoice-items {
+  width: 100%;
+}
+.invoice .invoice-items td {
+  border-top: #eee 1px solid;
+}
+.invoice .invoice-items .total td {
+  border-top: 2px solid #333;
+  border-bottom: 2px solid #333;
+  font-weight: 700;
+}

src/css/7_themes/transactional/transactional.scss

@@ -0,0 +1,4 @@
+@import "base";
+@import "sections.header.scss";
+@import "sections.footer.scss";
+@import "sections.invoices.scss";

src/css/base.scss

@@ -4,6 +4,7 @@
 @import "6_components/_component.ink.alert";
 @import "6_components/_component.ink.button";
 @import "6_components/_component.ink.button";
+@import "6_components/_component.alert-header";
 @import "6_components/_component.caption";
 @import "6_components/_component.video";
 @import "6_components/_component.progressbar";

src/html-components/base.html → src/html-components/_base.html

@@ -7,12 +7,12 @@
   {% block main_css %}<link href="/css/main.css" media="all" rel="stylesheet" type="text/css" />{% endblock %}
   {% block responsive_css %}<link href="/css/responsive.css" media="all" data-ignore="ignore" rel="stylesheet" type="text/css" />{% endblock %}
   {% block theme_css %}{% endblock %}
-  {% from "/html-components/component.button.html" import button %}
-  {% from "/html-components/component.caption.html" import caption %}
-  {% from "/html-components/component.progressbar.html" import progressbar %}
-  {% from "/html-components/component.video.html" import video %}
-  {% from "/html-components/component.panel.html" import panel %}
-
+  {% from "/html-components/_component.button.html" import button %}
+  {% from "/html-components/_component.caption.html" import caption %}
+  {% from "/html-components/_component.progressbar.html" import progressbar %}
+  {% from "/html-components/_component.video.html" import video %}
+  {% from "/html-components/_component.panel.html" import panel %}
+  {% from "/html-components/_component.alertHeader.html" import alertHeader %}
 </head>
 <body>
   <table class="body">

src/html-components/_component.alertHeader.html

@@ -0,0 +1,18 @@
+{% macro alertHeader(label='', class='', align='left') %}
+<table class="row alert-container {{ class }}">
+  <tbody><tr>
+    <td class=" last">
+
+        <table class="twelve columns">
+          <tbody><tr>
+            <td class="alert-content">
+                {{label}}
+            </td>
+            <td class="expander"></td>
+          </tr>
+        </tbody></table>
+    </td>
+  </tr>
+</table>
+{% endmacro %}
+

src/server/configs/configs.logs.js

@@ -17,6 +17,7 @@ module.exports = {
         var params = {
             room: configs.logs.hipchat.room,
             from: 'Email Server',
+            notification: true,
             message: messageText,
             color: 'yellow'
           };