Merge branch 'develop'

socialappslab · Mar 25, 2018 · 052e8c2 · 052e8c2
2 parents 144584f + 4f5eb6a
commit 052e8c2
Show file tree

Hide file tree

Showing 7 changed files with 313 additions and 218 deletions.
diff --git a/app/delegates/NotificationsDelegate.java b/app/delegates/NotificationsDelegate.java
diff --git a/conf/messages.en b/conf/messages.en
@@ -201,4 +201,20 @@ notification.description.general=There are news related to a {0} in {1} '{2}'
 appcivist.configuration.missing=Configurations not found in local.conf {0}
 resourceSpace.type=Missing resource space type: {0}
 contribution.previous.proposal.document=Previous proposal document
-contribution.etherpad.words=words
+contribution.etherpad.words=words
+
+### Mail notifications
+mail.notification.unsubscribe=Unsubscribe
+mail.notification.new_activity=New Activity
+mail.notification.date_text=Weekly Newsletter
+mail.notification.campaign_description_text=Campaign Description
+mail.notification.stage_name_text=is gattering contributions for the following themes:
+mail.notification.campaign_name_text=has the following working groups:
+mail.notification.more_information_text=More information about the campaign can be found in the following resources:
+mail.notification.campaign_description_text.no_activity=This campaign is currently in the idea collection stage. Submit one now!
+mail.notification.new_proposal_text=Your working group {0} has submitted {1} new proposals:
+mail.notification.new_ideas_number_text=new ideas have been submitted last week:
+mail.notification.updates_text=Here are the updates from the ideas you follow:
+mail.notification.campaign_description_text.proposal=This campaign is currently in the proposal creation stage
+mail.notification.proposal_developing_text=Your working group {0} is currently developing the following proposals:
+mail.notification.updates_text.proposal=Summary of other working groups
diff --git a/conf/messages.es b/conf/messages.es
@@ -185,4 +185,20 @@ notification.title.message.reply.group=Nueva Respuesta para Grupo de Trabajo
 notification.title.message.new.assembly=Nuevo Mensaje para Asamblea
 notification.title.message.reply.assembly=Nueva Respuesta para Asamblea
 contribution.previous.proposal.document=Documento de propuesta anterior
-contribution.etherpad.words=palabras
+contribution.etherpad.words=palabras
+
+### Mail notifications
+mail.notification.unsubscribe=Desuscribirse
+mail.notification.new_activity=Nueva Actividad
+mail.notification.date_text=Notificación Semanal
+mail.notification.campaign_description_text=Descripción de la Campaña
+mail.notification.stage_name_text=está recogiendo contribuciones para los siguientes temas:
+mail.notification.campaign_name_text=tiene los siguientes grupos de trabajo:
+mail.notification.more_information_text=Más información sobre la campaña puede encontrarse en:
+mail.notification.campaign_description_text.no_activity=Esta campaña está actualmente en la etapa de recolección de ideas. ¡Evía una ahora!
+mail.notification.new_ideas_number_text= nuevas ideas han sido enviadas la semana pasada:
+mail.notification.updates_text=Aquí están las actualizaciones de las ideas que sigues:
+mail.notification.campaign_description_text.proposal=Esta campaña está actualmente en la etapa de creación de propuestas
+mail.notification.new_proposal_text=Tu grupo de trabajo {0} ha enviado {1} nuevas propuestas:
+mail.notification.proposal_developing_text=Tu grupo de trabajo {0} está desarrollando actualmente las siguientes propuestas:
+mail.notification.updates_text.proposal=Resumen de los otros grupos de trabajo
diff --git a/...ication-templates/newsletters-templates/mail/newsletter-backend-template-no-activity.html b/...ication-templates/newsletters-templates/mail/newsletter-backend-template-no-activity.html
diff --git a/...tion-templates/newsletters-templates/mail/newsletter-backend-template-proposal-stage.html b/...tion-templates/newsletters-templates/mail/newsletter-backend-template-proposal-stage.html
diff --git a/...ation-templates/newsletters-templates/mail/newsletter-backend-template-with-activity.html b/...ation-templates/newsletters-templates/mail/newsletter-backend-template-with-activity.html
diff --git a/conf/signals-notification-templates/regular-templates/regular.html b/conf/signals-notification-templates/regular-templates/regular.html
@@ -446,7 +446,7 @@
   <!--[if !mso]><!--><style type="text/css">
 @import url(https://fonts.googleapis.com/css?family=Merriweather:400italic,400,700,700italic|Open+Sans:400italic,700italic,700,400|Source+Sans+Pro:400,700,400italic,700italic);
 </style><link href="https://fonts.googleapis.com/css?family=Merriweather:400italic,400,700,700italic|Open+Sans:400italic,700italic,700,400|Source+Sans+Pro:400,700,400italic,700italic" rel="stylesheet" type="text/css"><!--<![endif]--><style type="text/css">
-body{background-color:#eff0ed}.logo a:hover,.logo a:focus{color:#fff !important}.mso .layout-has-border{border-top:1px solid #bec2b5;border-bottom:1px solid #bec2b5}.mso .layout-has-bottom-border{border-bottom:1px solid #bec2b5}.mso .border,.ie .border{background-color:#bec2b5}.mso h1,.ie h1{}.mso h1,.ie h1{font-size:26px !important;line-height:34px !important}.mso h2,.ie h2{}.mso h2,.ie h2{font-size:20px !important;line-height:28px !important}.mso h3,.ie h3{}.mso .layout__inner,.ie .layout__inner{}.mso .footer__share-button p{}.mso .footer__share-button p{font-family:Open Sans,sans-serif}
+body{background-color:#0c6d5a}.logo a:hover,.logo a:focus{color:#fff !important}.mso .layout-has-border{border-top:1px solid #02110e;border-bottom:1px solid #02110e}.mso .layout-has-bottom-border{border-bottom:1px solid #02110e}.mso .border,.ie .border{background-color:#02110e}.mso h1,.ie h1{}.mso h1,.ie h1{font-size:26px !important;line-height:34px !important}.mso h2,.ie h2{}.mso h2,.ie h2{font-size:20px !important;line-height:28px !important}.mso h3,.ie h3{}.mso .layout__inner,.ie .layout__inner{}.mso .footer__share-button p{}.mso .footer__share-button p{font-family:Open Sans,sans-serif}
 </style><meta name="robots" content="noindex,nofollow"></meta>
 <meta property="og:title" content="Appcivist"></meta>
 </head>
@@ -456,16 +456,16 @@
 <!--[if !mso]><!-->
   <body class="full-padding" style="margin: 0;padding: 0;-webkit-text-size-adjust: 100%;">
 <!--<![endif]-->
-    <table class="wrapper" style="border-collapse: collapse;table-layout: fixed;min-width: 320px;width: 100%;background-color: #eff0ed;" cellpadding="0" cellspacing="0" role="presentation"><tbody><tr><td>
+    <table class="wrapper" style="border-collapse: collapse;table-layout: fixed;min-width: 320px;width: 100%;background-color: #0c6d5a;" cellpadding="0" cellspacing="0" role="presentation"><tbody><tr><td>
       <div role="banner">
         <div class="preheader" style="Margin: 0 auto;max-width: 560px;min-width: 280px; width: 280px;width: calc(28000% - 167440px);">
           <div style="border-collapse: collapse;display: table;width: 100%;">
           <!--[if (mso)|(IE)]><table align="center" class="preheader" cellpadding="0" cellspacing="0" role="presentation"><tr><td style="width: 280px" valign="top"><![endif]-->
-            <div class="snippet" style="display: table-cell;Float: left;font-size: 12px;line-height: 19px;max-width: 280px;min-width: 140px; width: 140px;width: calc(14000% - 78120px);padding: 10px 0 5px 0;color: #968f8b;font-family: Open Sans,sans-serif;">
+            <div class="snippet" style="display: table-cell;Float: left;font-size: 12px;line-height: 19px;max-width: 280px;min-width: 140px; width: 140px;width: calc(14000% - 78120px);padding: 10px 0 5px 0;color: #fff;font-family: Open Sans,sans-serif;">
 
             </div>
           <!--[if (mso)|(IE)]></td><td style="width: 280px" valign="top"><![endif]-->
-            <div class="webversion" style="display: table-cell;Float: left;font-size: 12px;line-height: 19px;max-width: 280px;min-width: 139px; width: 139px;width: calc(14100% - 78680px);padding: 10px 0 5px 0;text-align: right;color: #968f8b;font-family: Open Sans,sans-serif;">
+            <div class="webversion" style="display: table-cell;Float: left;font-size: 12px;line-height: 19px;max-width: 280px;min-width: 139px; width: 139px;width: calc(14100% - 78680px);padding: 10px 0 5px 0;text-align: right;color: #fff;font-family: Open Sans,sans-serif;">
 
             </div>
           <!--[if (mso)|(IE)]></td></tr></table><![endif]-->
@@ -474,7 +474,7 @@
         <div class="header" style="Margin: 0 auto;max-width: 600px;min-width: 320px; width: 320px;width: calc(28000% - 167400px);" id="emb-email-header-container">
         <!--[if (mso)|(IE)]><table align="center" class="header" cellpadding="0" cellspacing="0" role="presentation"><tr><td style="width: 600px"><![endif]-->
           <div class="logo emb-logo-margin-box" style="font-size: 26px;line-height: 32px;Margin-top: 11px;Margin-bottom: 25px;color: #fff;font-family: Source Sans Pro,Apple SD Gothic Neo,PT Sans,Trebuchet MS,sans-serif;Margin-left: 20px;Margin-right: 20px;" align="center">
-            <div class="logo-center" align="center" id="emb-email-header"><a style="text-decoration: none;transition: opacity 0.1s ease-in;color: #fff;" href="http://codiumsa.createsend1.com/t/i-l-bzwtk-l-r/"><img style="display: block;height: auto;width: 100%;border: 0;max-width: 167px;" src="https://i1.createsend1.com/ei/i/D5/857/DF1/235411/csfinal/AppCivist-White.png" alt="AppCivist" width="167"></a></div>
+            <div class="logo-center" align="center" id="emb-email-header"><a style="text-decoration: none;transition: opacity 0.1s ease-in;color: #fff;" href="http://codiumsa.createsend1.com/t/i-l-bzwtk-l-r/"><img style="display: block;height: auto;width: 100%;border: 0;max-width: 167px;" src="https://i1.createsend1.com/ei/i/D5/857/DF1/105517/csfinal/AppCivist-White.png" alt="AppCivist" width="167"></a></div>
           </div>
         <!--[if (mso)|(IE)]></td></tr></table><![endif]-->
         </div>
@@ -492,12 +492,12 @@
 
               <div style="Margin-left: 20px;Margin-right: 20px;">
       <div style="mso-line-height-rule: exactly;mso-text-raise: 4px;">
-        <h1 style="Margin-top: 0;Margin-bottom: 0;font-style: normal;font-weight: normal;color: #99a389;font-size: 22px;line-height: 31px;font-family: source sans pro,apple sd gothic neo,pt sans,trebuchet ms,sans-serif;text-align: center;"><span class="font-source-sans-pro"><font color="#0c6d5a">REGULAR_TITLE</font></span></h1><p style="Margin-top: 20px;Margin-bottom: 20px;font-family: source sans pro,apple sd gothic neo,pt sans,trebuchet ms,sans-serif;text-align: center;"><span class="font-source-sans-pro">Regular News:&nbsp; DATE</span></p>
+        <h1 style="Margin-top: 0;Margin-bottom: 0;font-style: normal;font-weight: normal;color: #99a389;font-size: 22px;line-height: 31px;font-family: source sans pro,apple sd gothic neo,pt sans,trebuchet ms,sans-serif;text-align: center;"><span class="font-source-sans-pro">{{NEW_ACTIVITY}}</span></h1><p style="Margin-top: 20px;Margin-bottom: 20px;font-family: source sans pro,apple sd gothic neo,pt sans,trebuchet ms,sans-serif;text-align: center;"><span class="font-source-sans-pro">{{DATE}}</span></p>
       </div>
     </div>
 
               <div style="Margin-left: 20px;Margin-right: 20px;">
-      <div style="mso-line-height-rule: exactly;line-height: 20px;font-size: 1px;">&nbsp;</div>
+      <div class="divider" style="display: block;font-size: 2px;line-height: 2px;Margin-left: auto;Margin-right: auto;width: 40px;background-color: #02110e;Margin-bottom: 20px;">&nbsp;</div>
     </div>
 
               <div style="Margin-left: 20px;Margin-right: 20px;">
@@ -506,24 +506,36 @@ <h1 style="Margin-top: 0;Margin-bottom: 0;font-style: normal;font-weight: normal
 
               <div style="Margin-left: 20px;Margin-right: 20px;">
       <div style="mso-line-height-rule: exactly;mso-text-raise: 4px;">
-        <p style="Margin-top: 0;Margin-bottom: 20px;font-family: source sans pro,apple sd gothic neo,pt sans,trebuchet ms,sans-serif;"><span class="font-source-sans-pro">REGULAR_DESCRIPTION</span></p>
+        <p style="Margin-top: 0;Margin-bottom: 0;font-family: source sans pro,apple sd gothic neo,pt sans,trebuchet ms,sans-serif;text-align: center;"><span class="font-source-sans-pro"><strong>{{REGULAR_TITLE}}</strong></span></p><p style="Margin-top: 20px;Margin-bottom: 20px;font-family: source sans pro,apple sd gothic neo,pt sans,trebuchet ms,sans-serif;"><span class="font-source-sans-pro">{{REGULAR_DESCRIPTION}}</span></p>
       </div>
     </div>
 
               <div style="Margin-left: 20px;Margin-right: 20px;">
-      <div class="divider" style="display: block;font-size: 2px;line-height: 2px;Margin-left: auto;Margin-right: auto;width: 40px;background-color: #bec2b5;Margin-bottom: 20px;">&nbsp;</div>
+      <div class="divider" style="display: block;font-size: 2px;line-height: 2px;Margin-left: auto;Margin-right: auto;width: 40px;background-color: #02110e;Margin-bottom: 20px;">&nbsp;</div>
+    </div>
+
+              <div style="Margin-left: 20px;Margin-right: 20px;">
+      <div style="mso-line-height-rule: exactly;mso-text-raise: 4px;">
+        <p style="Margin-top: 0;Margin-bottom: 20px;font-family: source sans pro,apple sd gothic neo,pt sans,trebuchet ms,sans-serif;text-align: center;"><span class="font-source-sans-pro">{{VISIT_TEXT}}</span></p>
+      </div>
     </div>
 
               <div style="Margin-left: 20px;Margin-right: 20px;">
       <div class="btn btn--flat btn--large" style="Margin-bottom: 20px;text-align: center;">
-        <![if !mso]><a style="border-radius: 4px;display: inline-block;font-size: 14px;font-weight: bold;line-height: 24px;padding: 12px 24px;text-align: center;text-decoration: none !important;transition: opacity 0.1s ease-in;color: #ffffff !important;background-color: #0c6d5a;font-family: Source Sans Pro, Apple SD Gothic Neo, PT Sans, Trebuchet MS, sans-serif;" href="UNSUSCRIBE_URL">Unsubscribe</a><![endif]>
-      <!--[if mso]><p style="line-height:0;margin:0;">&nbsp;</p><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" href="http://codiumsa.createsend1.com/t/i-l-bzwtk-l-y/" style="width:124px" arcsize="9%" fillcolor="#0C6D5A" stroke="f"><v:textbox style="mso-fit-shape-to-text:t" inset="0px,11px,0px,11px"><center style="font-size:14px;line-height:24px;color:#FFFFFF;font-family:Source Sans Pro,Apple SD Gothic Neo,PT Sans,Trebuchet MS,sans-serif;font-weight:bold;mso-line-height-rule:exactly;mso-text-raise:4px">Unsubscribe</center></v:textbox></v:roundrect><![endif]--></div>
+        <![if !mso]><a style="border-radius: 4px;display: inline-block;font-size: 14px;font-weight: bold;line-height: 24px;padding: 12px 24px;text-align: center;text-decoration: none !important;transition: opacity 0.1s ease-in;color: #ffffff !important;background-color: #0c6d5a;font-family: Source Sans Pro, Apple SD Gothic Neo, PT Sans, Trebuchet MS, sans-serif;" href="http://codiumsa.createsend1.com/t/i-l-bzwtk-l-y/">{{VISIT_BUTTON_TEXT}}</a><![endif]>
+      <!--[if mso]><p style="line-height:0;margin:0;">&nbsp;</p><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" href="http://codiumsa.createsend1.com/t/i-l-bzwtk-l-y/" style="width:196px" arcsize="9%" fillcolor="#0C6D5A" stroke="f"><v:textbox style="mso-fit-shape-to-text:t" inset="0px,11px,0px,11px"><center style="font-size:14px;line-height:24px;color:#FFFFFF;font-family:Source Sans Pro,Apple SD Gothic Neo,PT Sans,Trebuchet MS,sans-serif;font-weight:bold;mso-line-height-rule:exactly;mso-text-raise:4px">{{VISIT_BUTTON_TEXT}}</center></v:textbox></v:roundrect><![endif]--></div>
     </div>
 
-              <div style="Margin-left: 20px;Margin-right: 20px;Margin-bottom: 24px;">
+              <div style="Margin-left: 20px;Margin-right: 20px;">
       <div style="mso-line-height-rule: exactly;line-height: 5px;font-size: 1px;">&nbsp;</div>
     </div>
 
+              <div style="Margin-left: 20px;Margin-right: 20px;Margin-bottom: 24px;">
+      <div style="mso-line-height-rule: exactly;mso-text-raise: 4px;">
+        <p style="Margin-top: 0;Margin-bottom: 0;">
+      </div>
+    </div>
+
             </div>
           <!--[if (mso)|(IE)]></td><td class="layout__edges">&nbsp;</td></tr></table><![endif]-->
           </div>
@@ -534,14 +546,16 @@ <h1 style="Margin-top: 0;Margin-bottom: 0;font-style: normal;font-weight: normal
 
 
       <div style="mso-line-height-rule: exactly;" role="contentinfo">
-        <div class="layout email-footer" style="Margin: 0 auto;max-width: 600px;min-width: 320px; width: 320px;width: calc(28000% - 167400px);overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;">
+        <div class="layout email-footer" style="Margin: 0 auto;max-width: 800px;min-width: 620px; width: 320px;width: calc(28000% - 167400px);overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;">
           <div class="layout__inner" style="border-collapse: collapse;display: table;width: 100%;">
           <!--[if (mso)|(IE)]><table align="center" cellpadding="0" cellspacing="0" role="presentation"><tr class="layout-email-footer"><td style="width: 400px;" valign="top" class="w360"><![endif]-->
-            <div class="column wide" style="text-align: left;font-size: 12px;line-height: 19px;color: #968f8b;font-family: Open Sans,sans-serif;Float: left;max-width: 400px;min-width: 320px; width: 320px;width: calc(8000% - 47600px);">
+            <div class="column wide" style="text-align: center;font-size: 12px;line-height: 19px;color: #fff;font-family: Open Sans,sans-serif;Float: left;max-width: 800px;min-width: 620px; width: 620px;width: calc(8000% - 47600px);">
               <div style="Margin-left: 20px;Margin-right: 20px;Margin-top: 10px;Margin-bottom: 10px;">
 
                 <div style="font-size: 12px;line-height: 19px;">
-                  <div>Created by the&nbsp;Social Apps Lab&nbsp;at&nbsp;CITRIS, University of California, Berkeley</div>
+                  <div>Created by the&nbsp;Social Apps Lab&nbsp;at&nbsp;CITRIS, University of California, Berkeley<br>
+In partnership with the MiMove Team at INRIA, France<br>
+{{YEAR}} &#169; Regents of the University of California</div>
                 </div>
                 <div style="font-size: 12px;line-height: 19px;Margin-top: 18px;">
 
@@ -550,15 +564,21 @@ <h1 style="Margin-top: 0;Margin-bottom: 0;font-style: normal;font-weight: normal
               </div>
             </div>
           <!--[if (mso)|(IE)]></td><td style="width: 200px;" valign="top" class="w160"><![endif]-->
-            <div class="column narrow" style="text-align: left;font-size: 12px;line-height: 19px;color: #968f8b;font-family: Open Sans,sans-serif;Float: left;max-width: 320px;min-width: 200px; width: 320px;width: calc(72200px - 12000%);">
+            <div class="column narrow" style="text-align: left;font-size: 12px;line-height: 19px;color: #fff;font-family: Open Sans,sans-serif;Float: left;max-width: 320px;min-width: 200px; width: 320px;width: calc(72200px - 12000%);">
               <div style="Margin-left: 20px;Margin-right: 20px;Margin-top: 10px;Margin-bottom: 10px;">
 
               </div>
             </div>
           <!--[if (mso)|(IE)]></td></tr></table><![endif]-->
           </div>
         </div>
-
+        <div class="layout one-col email-footer" style="Margin: 0 auto;max-width: 600px;min-width: 320px; width: 320px;width: calc(28000% - 167400px);overflow-wrap: break-word;word-wrap: break-word;word-break: break-word;">
+          <div class="layout__inner" style="border-collapse: collapse;display: table;width: 100%;">
+          <!--[if (mso)|(IE)]><table align="center" cellpadding="0" cellspacing="0" role="presentation"><tr class="layout-email-footer"><td style="width: 600px;" class="w560"><![endif]-->
+
+          <!--[if (mso)|(IE)]></td></tr></table><![endif]-->
+          </div>
+        </div>
       </div>
       <div style="mso-line-height-rule: exactly;line-height: 40px;font-size: 40px;">&nbsp;</div>
     </div></td></tr></tbody></table>