Merge pull request #276 from ydaniel98/street-sleeper

Street sleeper
focallocal · May 19, 2017 · e3f24cf · e3f24cf
2 parents 3005965 + d98771e
commit e3f24cf
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 27 deletions.
diff --git a/both/collections/events.js b/both/collections/events.js
@@ -231,7 +231,7 @@ Events.attachSchema(new SimpleSchema({
     },
     name: {
         type: String,
-        label: 'Event name',
+        label: 'Name',
         max: 100,
         autoform: {
             id: "event-name"
@@ -305,7 +305,7 @@ Events.attachSchema(new SimpleSchema({
     },
     meetingPoint: {
         type: String,
-        label: 'Meeting point',
+        label: 'How to Find',
         max: 100
     },
     findHints: {
@@ -316,7 +316,7 @@ Events.attachSchema(new SimpleSchema({
     },
     dateEvent: {
         type: Date,
-        label: 'Date of the action',
+        label: 'Date',
         autoform: {
             type: 'pickadate',
             pickadateOptions: {

diff --git a/both/i18n/en/app.en.i18n.json b/both/i18n/en/app.en.i18n.json
@@ -42,10 +42,6 @@
       "5":"6. Choose a Date and Time",
       "6":"7. Description/More Details",
       "sub":{
-        "0":{
-          "0":"Not sure? Here's a list of suggestions:",
-          "1":"REMOVE"
-        },
         "2":"REMOVE",
         "3":"Be as specific as possible. Next to a statue? North, West of a bridge? Not sure? Check Google Earth",
         "4":"Carrying a Teddy Bear on your Shoulder? Wearing a bright yellow hat? wearing a Focallocal badge or T-shirt?"
@@ -57,9 +53,6 @@
       "2": "Submit",
       "3": "Suggestions",
       "4": "Offer a new resource"
-    },
-    "links": {
-      "0": "http://discuss.focallocal.org/t/suggested-resources-to-offer/158"
     }
   },
   "editEvent":{
@@ -74,9 +67,9 @@
     }
   },
   "congratsModal":{
-    "title":"Congratulations, your resource is LIVE and ready to help those in need!",
-    "subtitle":"Promote if needed - we've made it super easy for you!",
-    "subtitle_1":"Share with your friends with just one click",
+    "title":"Congratulations!",
+    "subtitle":"We’re one step closer to a happier and more connected World",
+    "subtitle_1":"Use the tools below, we’ve made it super easy for you to reach many more people!",
     "text":{
       "0":"Simply click the buttons above and copy/paste the info below.",
       "1":"with the Focallocal Community",
@@ -100,7 +93,7 @@
       "1":"Sitemap",
       "2":"Connect",
       "sub":{
-        "0":"This website is part of",
+        "0":"This website has been created by volunteers at the Focallocal Positive Action Community as part of our mission if local action for global change. Find out more and join us at",
         "1":{
           "list":{
             "0":"Home",
@@ -208,6 +201,9 @@
     },
     "btns":{
       "0":"Toggle All"
+    },
+    "links": {
+      "0": "http://news.focallocal.org/homelessness-resource-map-about"
     }
   },
   "event":{

diff --git a/client/templates/congratsModal/congratsModal.html b/client/templates/congratsModal/congratsModal.html
@@ -31,12 +31,12 @@ <h6>{{_ "congratsModal.subtitle_1"}}</h6>
                     {{name}}: {{category.name}} {{_ "congratsModal.text.1"}} <br />
                     {{_ "congratsModal.text.tags.0"}}: {{description}} <br />
                     {{_ "congratsModal.text.2"}}<br/>
-                    {{_ "congratsModal.text.tag.1"}}: {{printDate dateEvent}} <br />
-                    {{_ "congratsModal.text.tag.2"}}: {{address}} <br />
-                    {{_ "congratsModal.text.tag.3"}}: {{meetingPoint}} <br />
-                    {{_ "congratsModal.text.tag.4"}}: {{findHints}} <br />
+                    {{_ "congratsModal.text.tags.1"}}: {{printDate dateEvent}} <br />
+                    {{_ "congratsModal.text.tags.2"}}: {{address}} <br />
+                    {{_ "congratsModal.text.tags.3"}}: {{meetingPoint}} <br />
+                    {{_ "congratsModal.text.tags.4"}}: {{findHints}} <br />
                     {{#if url}}
-                        {{_ "congratsModal.text.tag.5"}}: <a href="{{url}}" target="_blank">{{url}}</a>
+                        {{_ "congratsModal.text.tags.5"}}: <a href="{{url}}" target="_blank">{{url}}</a>
                     {{/if}}<br />
                   </blockquote>
                 </div>

diff --git a/client/templates/eventConfirmReport/eventConfirmReport.html b/client/templates/eventConfirmReport/eventConfirmReport.html
@@ -1,7 +1,7 @@
 <template name="eventConfirmReport">
 	<div id="{{id}}" class="modal">
 		<div class="modal-content">
-			<h4>Are you sure you want to report this event?</h4>
+			<h4>Are you sure you want to report this?</h4>
 		</div>
 		<div class="modal-footer">
 				<a href="#!" class="yes-btn modal-action modal-close waves-effect waves-amber btn-flat">Yes</a>

diff --git a/client/templates/eventsForm/new/newEvent.html b/client/templates/eventsForm/new/newEvent.html
@@ -10,7 +10,6 @@ <h3 class="txt-center" id="eventTitle">{{_ "newEvent.title"}}</h3>
 							<li class="sequence-field" value="0">
 								<div class="col">
 									<h5>{{_ "newEvent.section_titles.0"}}</h5>
-									<span class="grey-text right-align">{{_ "newEvent.section_titles.sub.0.0"}} <a href="http://news.focallocal.org/activities">news.focallocal.org/activities</a></span>
 								</div>
 								{{> afQuickField name="organiser._id"}}
 								{{> afQuickField name="organiser.name"}}

diff --git a/client/templates/layouts/_footer.html b/client/templates/layouts/_footer.html
@@ -6,7 +6,7 @@
                 <h3 class="white-text">{{_ "_footer.section_titles.0"}}</h3>
 
                 <p class="grey-text text-lighten-4">
-                    {{_ "_footer.section_titles.sub.0"}} <a href="http://www.focallocal.org">{{_ "general.text.focallocal.web"}}</a>
+                    {{_ "_footer.section_titles.sub.0"}} <a href="http://www.focallocal.org">focallocal.org</a>
                 </p>
             </div>
             <div class="col l4 s12">

diff --git a/client/templates/map/map.html b/client/templates/map/map.html
@@ -28,7 +28,8 @@ <h4>{{_ "map.text.0"}}</h4>
         <ul>
             <li><a id="guide-btn" class="btn-floating tooltipped yellow darken-4"
                    data-position="left" data-delay="10" data-tooltip="Guide 4 Success"
-                    href="http://focallocal.org/how-to-create-a-positive-social-action-activity" target="_blank">?</a></li>
+                    href='
+                    {{_ "map.links.0"}}' target="_blank">?</a></li>
         </ul>
     </div>
 

diff --git a/client/templates/welcomeModal/welcomeModal.js b/client/templates/welcomeModal/welcomeModal.js
@@ -83,9 +83,9 @@ Template.welcomeModal.helpers({
 			eventMap.setZoom(12);
 		}
 
-		setTimeout(function() {
-			$("#welcomeModal").show(500);
-			$(".lean-overlay").css({"opacity": 0.5});
-		}, 2000);
+		// setTimeout(function() {
+		// 	$("#welcomeModal").show(500);
+		// 	$(".lean-overlay").css({"opacity": 0.5});
+		// }, 2000);
 	}
 });