Merge pull request #1 from KirstieJane/gh-pages

Merge upstream

README.md

@@ -1,3 +1,4 @@
+
 # STEMM Role Models App
 
 ***Inspire future generations by providing the most exciting and diverse speakers for your conference.***
@@ -47,8 +48,8 @@ The founders of the STEMM Role Models app - [Kirstie][link_KirstieJane], [Amy][l
 The development of this app is mentored by the team behind the [Rosalind Franklin Appathon][link_rfappapthon] - a challenge launched in 2015 to find and support the development of new mobile phone apps to empower women in STEMM. The competition is funded by the [Royal Society's Rosalind Franklin award][link_royalsociety_rfaward] which was won in 2014 by the Prof [Rachel McKendry][link_rachelmckendry]. Check out her [awesome lecture][link_rachelmckendry_talk] on _Harnessing the power of mobile phones and big data for global health_.
 
 <a href="https://www.mozillascience.org/about">
-  <img 
-    src="http://mozillascience.github.io/working-open-workshop/assets/images/science-fox.svg" 
+  <img
+    src="http://mozillascience.github.io/working-open-workshop/assets/images/science-fox.svg"
     align="right"
     width=140
   </img>
@@ -113,12 +114,12 @@ Thank you so much (Danke schön! Merci beaucoup!) for visiting the project and w
 [link_erin]: https://github.com/erich001
 [link_elizabeth]: https://github.com/elizabethjm
 [link_rfappapthon]: http://www.rfappathon.org/
-[link_royalsociety_rfaward]: https://royalsociety.org/grants-schemes-awards/awards/rosalind-franklin-award/ 
+[link_royalsociety_rfaward]: https://royalsociety.org/grants-schemes-awards/awards/rosalind-franklin-award/
 [link_rachelmckendry]: https://www.ucl.ac.uk/tb/people/steering-group/rachel-mckendry
 [link_rachelmckendry_talk]: https://royalsociety.org/events/2014/11/rosalind-franklin-lecture/
 [link_openleaderscohort]: https://www.mozillascience.org/wow-introducing-working-open-workshops-and-the-open-leaders-cohort
 [link_mozsci]: https://www.mozillascience.org/about
 [link_mozwow]: http://mozillascience.github.io/working-open-workshop/index.html
 [link_researchfox]: http://mozillascience.github.io/working-open-workshop/assets/images/science-fox.svg
 [link_leancanvas]: https://app.leanstack.com/canvases/p/2e4a5016-7fb5-4c77-b1cf-ed65518b7603
-[link_impostersyndrome]: https://en.wikipedia.org/wiki/Impostor_syndrome
+[link_impostersyndrome]: https://en.wikipedia.org/wiki/Impostor_syndrome

documentation/privacy_policy.md

@@ -0,0 +1,9 @@
+# Privacy Policy
+
+While the database itself needs to be searchable we also want to make sure we aren't sharing information unnecessarily and/or without permission.
+
+At time of writing there is no login required to browse the database.
+
+To add to the database (either in terms of adding yourself or recommending others) you need to provide your email address so we know who is contributing content. That email address will never be made public.
+
+However, if you add your email address to your profile then it will be public (somewhat obviously).

documentation/twitter_guidelines.md

@@ -0,0 +1,10 @@
+# Twitter guidelines
+
+At the moment the [@STEMMRoleModels](https://twitter.com/STEMMRoleModels) twitter account is currently run by [@KirstieJane](https://github.com/KirstieJane). She tries to tweet by these rules:
+
+ * **Stay positive** - although one of the goals of the STEMM Role Models project is to discuss the importance of diversity in STEMM fields, we don't want to add too much negative fuel to the social media storm. So if there are stories focused on failures of inclusivity, then try to re-tweet from personal accounts rather than from the STEMMRoleModels account. But if there are stories focused on the importance of diversity or on different efforts to tackle the problem then re-tweet supportively!
+
+ * **Follow freely** - there are lots of great initiatives out there and many more members of under-represented groups who might want to connect with us (and with whom we almost CERTAINLY want to connect).
+
+ * **Ask questions** - if we have a new issue or we want feedback on something to do with the project, ask the twitter followers for their thoughts! Remember to include the link to where they can contribute their thoughts if appropriate.
+

js/app.js

@@ -83,7 +83,7 @@ $(document).ready(function(){
     showPop(id);
   });
 
-  $("body").on("click",".event-popup .event-photo img",function(e){
+  $("body").on("click",".event-popup .speaker-photo img",function(e){
     $(".event-popup-wrapper .large-photo").show();
     e.stopPropagation();
   });
@@ -107,7 +107,7 @@ $(document).ready(function(){
   });
 
   $("body").on("click",".event-popup-wrapper .expand a",function(e){
-    $(this).closest(".event-description").removeClass("long");
+    $(this).closest(".speaker-description").removeClass("long");
     return false;
   });
 
@@ -194,32 +194,32 @@ function showPop(id){
 
       pop.find(".value").addClass("not-specified").text("Not filled in");
       pop.find(".value").parent().addClass("not-specified");
-      pop.find(".event-photo").hide();
+      pop.find(".speaker-photo").hide();
 
       for(var j in item){
         if(pop.find("." + j).length > 0){
           var value = item[j];
 
-          if(j == "event-date"){
+          if(j == "joined-date"){
             if(value == ""){
               value = item["event-timestamp"];
             }
             value = formatDate(value);
           }
 
-          if(j == "event-photo") {
+          if(j == "speaker-photo") {
             if(value) {
-              pop.find(".event-photo").show();
-              pop.find(".event-photo img").attr("src",value);
+              pop.find(".speaker-photo").show();
+              pop.find(".speaker-photo img").attr("src",value);
               pop.find(".large-photo .photo").css("background-image","url(" + value + ")");
             }
           }
 
-          if(j == "event-attendance"){
+          if(j == "n-lectures"){
             value = numberWithCommas(value);
           }
 
-          if(j == "club-contact-details"){
+          if(j == "rec-twitter"){
             if(value.length > 0) {
               value = value.replace("@","");
               value = "https://twitter.com/" + value;
@@ -258,7 +258,7 @@ function showPop(id){
 
             valueEl.html(valueEl.html() + append + " ");
           }
-          if(j == "event-description"){
+          if(j == "speaker-description"){
             var descriptionHeight = valueEl.parent().height();
             if(descriptionHeight > 150) {
               valueEl.parent().addClass("long");
@@ -316,8 +316,8 @@ function formatDate(dateString) {
 // Sorts event report objects by date
 
 function dateSort(a,b){
-  var dateA = new Date(a["event-date"]);
-  var dateB = new Date(b["event-date"]);
+  var dateA = new Date(a["joined-date"]);
+  var dateB = new Date(b["joined-date"]);
   if(dateA > dateB) {
     return -1;
   } else {
@@ -340,11 +340,11 @@ function updateCounts(){
   for(var k in data){
     var item = data[k];
     if(item.visible) {
-      var attendance = parseInt(item["event-attendance"]);
+      var attendance = parseInt(item["n-lectures"]);
       if(!isNaN(attendance)){
         participants = participants + attendance;
       }
-      var country = item["club-country"];
+      var country = item["speaker-country"];
       if(country != "" && countries.indexOf(country) < 0) {
         countries.push(country);
       }
@@ -382,7 +382,7 @@ function displayEvents(){
 
 
     var hasMedia = false;
-    var mediaTypes = ["event-creations","event-links-photos","event-links-blogpost","event-links-video"];
+    var mediaTypes = ["event-creations","speaker-links-prof","speaker-links-code","speaker-links-social", "speaker-characteristics"];
 
     for(var i = 0; i < mediaTypes.length; i++) {
       var mediaType = mediaTypes[i];
@@ -401,14 +401,14 @@ function displayEvents(){
     for(var j in item){
       var value = item[j];
 
-      if(j == "event-photo") {
+      if(j == "speaker-photo") {
         if(value) {
           itemEl.find(".top").removeClass("no-photo");
           itemEl.find(".top").css("background-image","url("+value+")");
         }
       }
 
-      if(j == "event-attendance"){
+      if(j == "n-lectures"){
         if(!isNaN(parseInt(value))){
           participants = participants + parseInt(value);
         }
@@ -442,8 +442,8 @@ function cleanupData(){
         newItem[newKey] = item[k];
       }
 
-      if(newItem["event-date"] == "") {
-        newItem["event-date"] = newItem["event-timestamp"];
+      if(newItem["joined-date"] == "") {
+        newItem["joined-date"] = newItem["event-timestamp"];
       }
 
       newItem.id = i + 2;
@@ -526,13 +526,13 @@ function populateElement(el, item){
   for(var j in item){
     if(el.find("." + j).length > 0){
       var value = item[j];
-      if(j == "event-date"){
+      if(j == "joined-date"){
         if(value == ""){
           value = item["event-timestamp"];
         }
         value = formatDate(value);
       }
-      if(j == "event-attendance"){
+      if(j == "n-lectures"){
         value = numberWithCommas(value);
       }
       if(value.length == 0){

js/config.js

@@ -1,28 +1,29 @@
 // Your Google Drive Spreadsheet URL
-var sheetID = "1QHl2bjBhMslyFzR5XXPzMLdzzx7oeSKTbgR5PM8qp64";
-var sheetURL = "https://spreadsheets.google.com/feeds/cells/"+sheetID+"/ohaibtm/public/values?alt=json";
+var sheetID = "147nwbdx3D4kGywszzghfODm8SoOisASisjr9sU39Dr8";
+var sheetURL = "https://spreadsheets.google.com/feeds/cells/"+sheetID+"/od6/public/values?alt=json";
 
 // Name of column and what element classname to insert the data into.
 var dataKeys = {
-  "Status" : "report-status",
+  "Status" : "report-status", // Must be set to 'Approved'
   "Timestamp" : "event-timestamp",
-  "Date of Event" : "event-date",
-  "Your Name" : "club-organizer",
-  "Your Twitter Handle (Optional)" : "club-contact-details",
-  "Club Name" : "club-name",
-  "Club Link" : "club-link",
-  "City" : "event-city",
-  "Country" : "club-country",
+  "Joined On" : "joined-date", // Shown in main listing
+  "Recommended By" : "rec-name",
+  "Your Twitter Handle (Optional)" : "rec-twitter",
+  "Speaker Name" : "speaker-name", // Shown in main listing
+  "Speaker Email" : "speaker-email",
+  "City" : "speaker-city",
+  "Country" : "speaker-country", // Shown in main listing
   "Event Location" : "event-location",
-  "Attendance" : "event-attendance",
-  "Event Description" : "event-description",
-  "Event Cover Photo" : "event-photo",
-  "Event Creations" : "event-creations",
-  "Web Literacy Skills" : "event-skills",
-  "Links to Curriculum (Optional)" : "event-links-curriculum",
-  "Links to Photos (Optional)" : "event-links-photos",
-  "Links to Blogpost (Optional)" : "event-links-blogpost",
-  "Links to Video (Optional)" : "event-links-video",
-  "Feedback from Attendees" : "event-feedback-attendees",
-  "Your Feedback" : "event-feedback-organizer"
+  "Number of Lectures" : "n-lectures", // Shown in main listing
+  "Description" : "speaker-description",
+  "Cover Photo" : "speaker-photo",
+  "Subspecialty" : "event-creations",
+  "Specialty" : "speaker-specialty",
+  "Links to Previous Talks (Optional)" : "speaker-links-lectures",
+  "Links to Professional Pages (Optional)" : "speaker-links-prof",
+  "Links to Data/Code (Optional)" : "speaker-links-code",
+  "Links to Social Media (Optional)" : "speaker-links-social",
+  "Characteristics" : 'speaker-characteristics',
+  "Feedback from Attendees" : "attendee-feedback",
+  "Your Recommendation" : "rec-feedback"
 }