Miscellaneous updates

canvas/index.php

@@ -914,15 +914,15 @@
                             <li><img src="../icon/by.large.png" alt="ethics-canvas-by-icon"/> </li>
                             <li><img src="../icon/share.large.png" alt="ethics-canvas-share-icon"/> </li>
                             <li><img src="../icon/cc.large.png" alt="ethics-canvas-cc-icon"/> </li>
-                            <li> <img src="../icon/remix.large.png" alt="ethics-canvas-remix-icon"/></li>
-                            <li> <img src="../icon/sa.large.png" alt="ethics-canvas-sa-icon"/></li>
+                            <li><img src="../icon/remix.large.png" alt="ethics-canvas-remix-icon"/></li>
+                            <li><img src="../icon/sa.large.png" alt="ethics-canvas-sa-icon"/></li>
                         </ul>
                     </div>
                     <p class="ethics-copy terms"><a href="../privacy-terms/terms.html">Terms of Service</a></p>
                     <p class="ethics-copy privacy"><a href="../privacy-terms/privacy.html">Privacy Policy</a></p>
                     
                     <p class="ethics-copy">The ADAPT Centre for Digital Content Technology</p> <p class="ethics-copy">is funded under the SFI Research Centres Programme (Grant 13/RC/2106).</p><p class="ethics-copy">It is co-funded under the European Regional Development Fund.</p>
-                    <p class="ethics-copy">Ethics Canvas v1.7|&copy; ADAPT Center &amp; Trinity College Dublin &amp; Dublin City University, 2016</p>
+                    <p class="ethics-copy">Ethics Canvas v1.8&nbsp;|&nbsp;&copy; ADAPT Centre &amp; Trinity College Dublin &amp; Dublin City University, 2017</p>
                     
                 </footer>
             </div>

canvas/php/canvas.php

@@ -12,7 +12,7 @@ if (empty($post_data)) {
     echo 'Hmm... I did NOT get any data posted by AJAX.';
 }
 if (!empty($post_data)) {
-  echo 'Awesome! got the json info :)';
+  echo 'Awesome! Got the JSON info :)';
     //$dir = 'YOUR-SERVER-DIRECTORY/files';
     //$file = uniqid().getmypid();
     //$filename = $dir.$file.'.txt';

canvas/php/check-if-tag-exists.php

@@ -3,7 +3,7 @@
     
     try {
         // Connect to the database
-        $database = databaseConnect();
+        $database = db_connect();
         
         // Incoming data
         $newTag = $_POST["tag"];
@@ -13,7 +13,7 @@
         $query = "SELECT tag FROM tags WHERE tag = '" . $newTag . "' AND username = '" . $username . "';";
         
         // Run query
-        $recordSet = databaseQueryWithReturn($database, $query);
+        $recordSet = db_query_return($database, $query);
         
         // Get the tag if it exists, and return an empty string if it does not exist
         $record = mysqli_fetch_assoc($recordSet);
@@ -25,7 +25,7 @@
         echo($tag);
         
         // Close the connection to the database
-        databaseClose($database);
+        db_close($database);
     }
     catch(Exception $e) {
         $errorMsg = $e->getMessage();

canvas/php/dashboard.php

@@ -69,7 +69,7 @@
                    <div class="row ">
                      <div class="user-canvases-intro text-center col-md-6 col-md-offset-3 ">
                         <h2 >Your canvases</h2>
-                        <p>The Canvases that you have created are displayed here.</p>
+                        <p>The canvases that you have created are displayed here.</p>
                      </div>
                     </div>
                      <div class="row user-canvas-gallery">
@@ -124,7 +124,7 @@
                             <p class="ethics-copy">The ADAPT Centre for Digital Content Technology</p>
                             <p class="ethics-copy">is funded under the SFI Research Centres Programme (Grant 13/RC/2106).</p>
                             <p class="ethics-copy">It is co-funded under the European Regional Development Fund.</p>
-                            <p class="ethics-copy">Ethics Canvas v1.7|&copy; ADAPT Center & Trinity College Dublin & Dublin City University, 2016</p>
+                            <p class="ethics-copy">Ethics Canvas v1.8&nbsp;|&nbsp;&copy; ADAPT Centre &amp; Trinity College Dublin &amp; Dublin City University, 2017</p>
                         </footer>
                     </div>
                     <!-- end of footer .row -->

canvas/php/delete-tag.php

@@ -3,7 +3,7 @@
     
     try {
         // Connect to the database
-        $database = databaseConnect();
+        $database = db_connect();
         
         // Incoming data
         $tag = $_POST["tag"];
@@ -13,10 +13,10 @@
         $query = "DELETE FROM tags WHERE tag = '" . $tag . "' AND username = '" . $username . "';";
         
         // Run query
-        databaseQueryNoReturn($database, $query);
+        db_query_no_return($database, $query);
         
         // Close the connection to the database
-        databaseClose($database);
+        db_close($database);
     }
     catch(Exception $e) {
         $errorMsg = $e->getMessage();

canvas/php/get-description-for-selected-tag.php

@@ -3,7 +3,7 @@
     
     try {
         // Connect to the database
-        $database = databaseConnect();
+        $database = db_connect();
         
         // Incoming data
         $tag = $_POST["tag"];
@@ -13,7 +13,7 @@
         $query = "SELECT description FROM tags WHERE tag = '" . $tag . "' AND username = '" . $username . "';";
         
         // Run query
-        $recordSet = databaseQueryWithReturn($database, $query);
+        $recordSet = db_query_return($database, $query);
         
         // Get description for the selected tag
         $record = mysqli_fetch_assoc($recordSet);
@@ -25,7 +25,7 @@
         echo($description);
         
         // Close the connection to the database
-        databaseClose($database);
+        db_close($database);
     }
     catch(Exception $e) {
         $errorMsg = $e->getMessage();

canvas/php/get-similar-tags.php

@@ -3,7 +3,7 @@
     
     try {
         // Connect to the database
-        $database = databaseConnect();
+        $database = db_connect();
         
         // Incoming data
         $currentTag = $_POST["tag"];
@@ -13,7 +13,7 @@
         $query = "SELECT tag, description, username FROM tags WHERE NOT username='" . $username . "' ORDER BY tag;";
         
         // Run query
-        $recordSet = databaseQueryWithReturn($database, $query);
+        $recordSet = db_query_return($database, $query);
         
         // Get similar tags
         $tags = Array();
@@ -46,7 +46,7 @@
         echo(json_encode($tags));
         
         // Close the connection to the database
-        databaseClose($database);
+        db_close($database);
     }
     catch(Exception $e) {
         $errorMsg = $e->getMessage();

canvas/php/get-tags.php

@@ -3,7 +3,7 @@
     
     try {
         // Connect to the database
-        $database = databaseConnect();
+        $database = db_connect();
         
         // Incoming data
         $username = $_POST["username"];
@@ -12,7 +12,7 @@
         $query = "SELECT tag FROM tags WHERE username = '" . $username . "' ORDER BY tag;";
         
         // Run query
-        $recordSet = databaseQueryWithReturn($database, $query);
+        $recordSet = db_query_return($database, $query);
         
         // Get tags by active user
         $tags = Array();
@@ -26,7 +26,7 @@
         echo(json_encode($tags));
         
         // Close the connection to the database
-        databaseClose($database);
+        db_close($database);
     }
     catch(Exception $e) {
         $errorMsg = $e->getMessage();

canvas/php/save-tag.php

@@ -3,7 +3,7 @@
     
     try {
         // Connect to the database
-        $database = databaseConnect();
+        $database = db_connect();
         
         // Incoming data
         $tag = $_POST["tag"];
@@ -13,7 +13,7 @@
         // Check if tag already exists
         $query = "SELECT tag FROM tags WHERE tag = '" . $tag . "' AND username = '" . $username . "';";
         
-        $recordSet = databaseQueryWithReturn($database, $query);
+        $recordSet = db_query_return($database, $query);
         
         $record = mysqli_fetch_assoc($recordSet);
         $tagCheck = $record["tag"];
@@ -31,10 +31,10 @@
         }
         
         // Insert new or update old description
-        databaseQueryNoReturn($database, $query);
+        db_query_no_return($database, $query);
         
         // Close the connection to the database
-        databaseClose($database);
+        db_close($database);
     }
     catch(Exception $e) {
         $errorMsg = $e->getMessage();

canvas/php/share-canvas.php

@@ -31,7 +31,7 @@
         $senderName = $row['name']; 
     
         // Share canvas email
-        $shareEmail = "Hello,<br><br>$senderName ($senderEmail) wanted to share with you the attached Ethics Canvas generated at <a href='https://ethicscanvas.org' target='_new'>EthicsCanvas.org</a>.<br><br>Kind regards,<br><br>Ethics Canvas Team";
+        $shareEmail = "Hello,<br><br>$senderName ($senderEmail) wanted to share with you the attached Ethics Canvas generated at <a href='https://ethicscanvas.org' target='_new'>EthicsCanvas.org</a>.<br><br>Kind regards,<br><br>The Ethics Canvas Team";
 
         // Send activation email
         include('../../php/mailer.php');

css/landing.css

@@ -82,7 +82,7 @@ CAROUSEL
 .carousel-content {
     height: 40em;
     width: 100%;
-    border-radius: 5px;
+    border-radius: 0 0 5px 5px;
     background-repeat: no-repeat;
     /*Make the background image responsive*/
     background-size: cover;
@@ -160,8 +160,7 @@ CONTENT: ABOUT THE ETHICS CANVAS
 
 .chalky-canvas img{
     width:60%;
-    border-radius: 5px;
-
+    border-radius: 0 0 5px 5px;
 
 }
 .chalky-canvas{
@@ -212,13 +211,9 @@ CONTENT: MEET THE TEAM
     text-align:center;
     padding-bottom: 1em;
 }
-
 .meet-the-team h2 {
     margin: 2.5em 0 1em 0;
 }
-
-
-
 .team-member h2, .team-member h3 {
     padding: 0.5em 1em;
 
@@ -231,12 +226,10 @@ CONTENT: MEET THE TEAM
 .team-member.wessel .member-contact {
     color: #18AE90;
 }
-
 .team-member.killian h3,
 .team-member.killian .member-contact{
     color:#606eb2;
 }
-
 .team-member.dave h3,
 .team-member.dave .member-contact{
     color:#80BF63;
@@ -245,6 +238,10 @@ CONTENT: MEET THE TEAM
 .team-member.arturo .member-contact{
     color:#6589B9;
 }
+.team-member.andreas h3 ,
+.team-member.andreas .member-contact{
+    color:#80BF63;
+}
 .team-member.farnoosh h3 ,
 .team-member.farnoosh .member-contact{
     color:#7E67A7;
@@ -882,7 +879,7 @@ MEDIA QUERIES
     .carousel-content {
         height: 30em;
         width: 100%;
-        border-radius: 5px;
+        border-radius: 0 0 5px 5px;
         background-repeat: no-repeat;
         /*Make the background image responsive*/
         background-size: cover;
@@ -900,7 +897,6 @@ MEDIA QUERIES
         margin:1em auto;
         width:60%;
         float:none;
-
     }
     .team-member.col-sm-6{
         margin:1em auto;
@@ -912,13 +908,10 @@ MEDIA QUERIES
         margin:1em auto!important;
         width:60%!important;
         float:none;
-
     }
     .chalky-canvas img{
         width:70%;
     }
-
-
 }
 @media (min-width: 991px) and (max-width: 1050px) {
     .btn {
@@ -945,4 +938,4 @@ MEDIA QUERIES
         width: 70%;
         margin: 1em 15%;
     }
-}
+}

icon/profile.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg enable-background="new 0 0 64 64" height="64px" version="1.1" viewBox="0 0 64 64" width="64px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Layer_1"><g><circle cx="32" cy="32" fill="#4F5D73" r="32"/></g><g opacity="0.2"><g><path d="M43.905,47.543c-3.821-1.66-5.217-4.242-5.643-6.469c2.752-2.215,4.943-5.756,6.148-9.573     c1.239-1.579,1.96-3.226,1.96-4.62c0-0.955-0.347-1.646-0.955-2.158c-0.203-8.106-5.942-14.613-13.039-14.714     C32.322,10.009,32.268,10,32.213,10c-0.022,0-0.043,0.004-0.065,0.004c-7.052,0.039-12.783,6.41-13.125,14.409     c-0.884,0.528-1.394,1.305-1.394,2.469c0,1.641,0.992,3.63,2.663,5.448c1.187,3.327,3.118,6.38,5.5,8.438     c-0.354,2.292-1.699,5.039-5.697,6.776c-2.159,0.938-6.105,1.781-7.808,2.649c4.362,4.769,12.624,7.769,19.589,7.805l0.099,0.003     C31.983,57.999,31.992,58,32,58c7.014,0,15.325-3.01,19.713-7.808C50.01,49.324,46.063,48.481,43.905,47.543z" fill="#231F20"/></g></g><g><g><path d="M43.905,45.543c-3.821-1.66-5.217-4.242-5.643-6.469c2.752-2.215,4.943-5.756,6.148-9.573     c1.239-1.579,1.96-3.226,1.96-4.62c0-0.955-0.347-1.646-0.955-2.158C45.213,14.618,39.474,8.11,32.378,8.01     C32.322,8.009,32.268,8,32.213,8c-0.022,0-0.043,0.004-0.065,0.004c-7.052,0.039-12.783,6.41-13.125,14.409     c-0.884,0.528-1.394,1.305-1.394,2.469c0,1.641,0.992,3.63,2.663,5.448c1.187,3.327,3.118,6.38,5.5,8.438     c-0.354,2.292-1.699,5.039-5.697,6.776c-2.159,0.938-6.105,1.781-7.808,2.649c4.362,4.769,12.624,7.769,19.589,7.805l0.099,0.003     C31.983,55.999,31.992,56,32,56c7.014,0,15.325-3.01,19.713-7.808C50.01,47.324,46.063,46.481,43.905,45.543z" fill="#FFFFFF"/></g></g></g><g id="Layer_2"/></svg>

index.html

@@ -40,8 +40,8 @@
             </div>
 
             <!-- ===================================
-                       Slick Carousel slider area
-                  =================================== -->
+Slick Carousel slider area
+=================================== -->
             <div class="container-fluid">
                 <div class="slider-area col-md-12 text-center">
                     <!-- ======= The markup for the Slick Carousel  ======== -->
@@ -96,8 +96,8 @@
             <!-- end of .container-fluid 0f the slider area -->
 
             <!-- ========================================
-               3 Link Areas (Online, sign up, download)
-             ========================================= -->
+3 Link Areas (Online, sign up, download)
+========================================= -->
             <div class="row user-area">
                 <!-- try it online -->
                 <div class=" try-online col-md-4 ">
@@ -131,9 +131,9 @@
 
                         <div class="tab-content">
                             <div id="signup-tab" class="tab-pane fade in active">
-                      <!-- ===================
-                          Sign up form area
-                      ====================== -->
+                                <!-- ===================
+Sign up form area
+====================== -->
                                 <div class="form-signup-feedback "></div>
                                 <form class="sign-up-form" action="sign-up.php" method="post" has-feedback>
 
@@ -181,9 +181,9 @@
                             </div>
                             <!-- second pill content -->
                             <div id="login-tab" class="tab-pane fade">
-                  <!-- ===================
-                      log in form area
-                  ====================== -->
+                                <!-- ===================
+log in form area
+====================== -->
                                 <div class="form-login-feedback "></div>
                                 <form class="log-in-form" action="log-in.php" method="post">
 
@@ -205,7 +205,7 @@
                                         <div class="form-message" id="pass-login-message"></div>
                                     </div>
                                     <div class="forgot-password">
-                                      <a href="#">Forgot your password?</a>
+                                        <a href="#">Forgot your password?</a>
                                     </div>
                                     <!-- log in button -->
 
@@ -215,34 +215,34 @@
                                 </form >
 
                             </div>
-                              <!-- end of second pill content -->
-                              <!-- third pill content -->
-                              <div id="reset-password-tab" class="tab-pane fade">
-                    <!-- ========================
-                        reset password form area
-                     =========================== -->
-                                  <div class="form-reset-password-feedback "></div>
-                                  <form class="reset-password-form" action="reset-password.php" method="post">
-
-                                      <!-- email -->
-                                      <div class="input-area">
-                                          <label for="email-reset-password">Your Email</label>
-                                          <p>
-                                              <input id="email-reset-password" name="email-reset-password" type="email" required/>
-                                          </p>
-                                          <div class="form-message " id="reset-password-message"></div>
-                                      </div>
-
-
-                                      <!-- reset password button -->
-
-                                      <button class="btn reset-password" type="submit" id="reset-password-btn" name="reset-password">
-                                          <span>Reset My Password</span>
-                                      </button>
-                                  </form >
-
-                              </div>
-                              <!-- end of third pill content -->
+                            <!-- end of second pill content -->
+                            <!-- third pill content -->
+                            <div id="reset-password-tab" class="tab-pane fade">
+                                <!-- ========================
+reset password form area
+=========================== -->
+                                <div class="form-reset-password-feedback "></div>
+                                <form class="reset-password-form" action="reset-password.php" method="post">
+
+                                    <!-- email -->
+                                    <div class="input-area">
+                                        <label for="email-reset-password">Your Email</label>
+                                        <p>
+                                            <input id="email-reset-password" name="email-reset-password" type="email" required/>
+                                        </p>
+                                        <div class="form-message " id="reset-password-message"></div>
+                                    </div>
+
+
+                                    <!-- reset password button -->
+
+                                    <button class="btn reset-password" type="submit" id="reset-password-btn" name="reset-password">
+                                        <span>Reset My Password</span>
+                                    </button>
+                                </form >
+
+                            </div>
+                            <!-- end of third pill content -->
                         </div>
                     </div>
 
@@ -261,8 +261,8 @@
             <!-- end of .row .user-area -->
 
             <!-- ===================
-                            HOW IT WORKS
-                           ===================-->
+HOW IT WORKS
+===================-->
             <div class="row">
                 <div class="how-it-works col-md-8 col-md-offset-2">
                     <h2 >HOW IT WORKS</h2>
@@ -284,8 +284,8 @@
             </div>
 
             <!-- ======================
-                ABOUT THE ETHICS CANVS
-               =======================-->
+ABOUT THE ETHICS CANVS
+=======================-->
             <div class="row">
                 <div class="about-ethics-canvas col-md-8 col-md-offset-2">
                     <h2>ABOUT THE ETHICS CANVAS</h2>
@@ -315,8 +315,8 @@
             </div>
 
             <!-- ======================
-                OUR VALUES
-               =======================-->
+OUR VALUES
+=======================-->
             <div class="row our-values">
                 <h2>OUR VALUES</h2>
                 <div class="nonprofit col-md-3 col-sm-6">
@@ -350,8 +350,8 @@
             </div>
             <!-- end of .row .our-values -->
             <!-- ======================
-                MEAT THE TEAM
-               =======================-->
+MEAT THE TEAM
+=======================-->
             <div class="row meet-the-team">
                 <div class="col-md-10 col-md-offset-1">
                     <h2>MEET THE TEAM</h2>
@@ -384,166 +384,176 @@
                         Dave is a Research Lecturer in the Knowledge and Data Engineering Group of the School of Computer Science and Statistics at Trinity College Dublin. He moved to TCD in 2002 from University College London where he worked for 11 years as a Research
                         Fellow in the Computer Science Department. <p>
 
-                        Dave's research interests are in the Semantic Modelling and Policy-Based Management in self-managing networks, services and organisations.</p>
+                    Dave's research interests are in the Semantic Modelling and Policy-Based Management in self-managing networks, services and organisations.</p>
                     </p>
-                </div>
-                <div class=" team-member killian col-md-4 col-sm-6">
-                    <h3 class="member-name">Dr.Killian Levacher
-                    </h3>
-                    <p class="member-role">Concept developer, ethics
-                    </p>
-                    <p class="member-contact">killian@ethicscanvas.org
-                    </p>
-                    <img src="img/killian.jpg" alt="Dr.Killian Levacher, Concept developer in the Online Ethics Canvas project"/>
-                    <p>
-
-Dr. Killian Levacher is a post-doctoral researcher at the ADAPT Centre, based in Trinity College the University of Dublin (TCD).
-His research focuses upon advancing the state of the art in the area of Deep Learning NLP within the context of Personalised Siri-like Dialogue Systems. </p><p>
-Prior to joining the ADAPT centre, Killian obtained an MSc and PhD in TCD, for which he received multiple academic awards (best research thesis and best academic results)</p>
-                </div>
             </div>
-            <!-- end of first .row .meet-the-team -->
-            <div class="row meet-the-team">
-
-                <div class=" team-member arturo  col-md-4  col-sm-6">
-                    <h3>Arturo Calvo
-                    </h3>
-                    <p class="member-role">Concept developer and business developer</p>
-                    <p class="member-contact">arturo@ethicscanvas.org
-                    </p>
-                    <img src="img/arturo.jpg" alt="Arturo Calvo, Concept developer and business development in the Online Ethics Canvas project"/>
-                    <p>
-                        Arturo is a software professional with experience in the industry and in academia. As a Software Architect at <a href="http://www.adaptcentre.ie" target="_new">ADAPT Centre</a>, he coordinates the overall technology of a set of research projects ranging from Machine Learning to Ethics.</p><p> Passionate about
-                        entrepreneurship and technology, he is very active in the Dublin startup ecosystem. Arturo founded three companies in the past, and he is CTO of a new one: <a href="https://www.sedicii.com" target="_new">Sedicii</a>. He is the main organiser of the <a href="http://www.meetup.com/Machine-Learning-Dublin/" target="_new">Machine Learning Dublin</a> meetup group.
-
-                    </p>
-                </div>
-                <div class=" team-member farnoosh col-md-4   col-sm-6 ">
-                    <h3>Farnoosh Mohri
-                    </h3>
-                    <p class="member-role">
-                        Frontend developer and Interaction designer</p>
-                        <p class="member-contact">farnoosh@ethicscanvas.org
-                        </p>
-                    <img src="img/farnoosh.jpg" alt="Farnoosh Mohri, Concept developer and business development in the Online Ethics Canvas project"/>
-                    <p>
-Farnoosh is an interaction designer and front end developer. She has a great passion for technology and how it can empower us as humans. She has studied web and multimedia development and she has been involed in different design and development projects with start-ups at Innovation Park in Sweden. </p><p>Farnoosh believes that our global digital connection and engagement is a crucial part of the human experience. She has joined the Online Ethics Canvas team at ADAPT Center, as a wish to create new possibilities through innovative digital content, and contribute to a better world.</p>
-                </div>
+            <div class=" team-member killian col-md-4 col-sm-6">
+                <h3 class="member-name">Dr.Killian Levacher
+                </h3>
+                <p class="member-role">Concept developer, ethics
+                </p>
+                <p class="member-contact">killian@ethicscanvas.org
+                </p>
+                <img src="img/killian.jpg" alt="Dr.Killian Levacher, Concept developer in the Online Ethics Canvas project"/>
+                <p>
+
+                    Dr. Killian Levacher is a post-doctoral researcher at the ADAPT Centre, based in Trinity College the University of Dublin (TCD).
+                    His research focuses upon advancing the state of the art in the area of Deep Learning NLP within the context of Personalised Siri-like Dialogue Systems. </p><p>
+                Prior to joining the ADAPT centre, Killian obtained an MSc and PhD in TCD, for which he received multiple academic awards (best research thesis and best academic results)</p>
             </div>
-            <!--  end of second .row .meet-the-team -->
-            <!-- ======================
-                  OUR PARTNERS
-               =======================-->
-            <div class="row our-partners">
-                <h2>OUR PARTNERS</h2>
-                <div class="nonprofit col-md-3 col-sm-6">
-                  <a href="http://adaptcentre.ie/"><h3>ADAPT Centre</h3>
+        </div>
+        <!-- end of first .row .meet-the-team -->
+        <div class="row meet-the-team">
+
+            <div class=" team-member arturo  col-md-4  col-sm-6">
+                <h3>Arturo Calvo
+                </h3>
+                <p class="member-role">Concept developer and business developer</p>
+                <p class="member-contact">arturo@ethicscanvas.org
+                </p>
+                <img src="img/arturo.jpg" alt="Arturo Calvo, Concept developer and business development in the Online Ethics Canvas project"/>
+                <p>
+                    Arturo is a software professional with experience in the industry and in academia. As a Software Architect at <a href="http://www.adaptcentre.ie" target="_new">ADAPT Centre</a>, he coordinates the overall technology of a set of research projects ranging from Machine Learning to Ethics.</p><p> Passionate about
+                entrepreneurship and technology, he is very active in the Dublin startup ecosystem. Arturo founded three companies in the past, and he is CTO of a new one: <a href="https://www.sedicii.com" target="_new">Sedicii</a>. He is the main organiser of the <a href="http://www.meetup.com/Machine-Learning-Dublin/" target="_new">Machine Learning Dublin</a> meetup group.
+
+                </p>
+            </div>
+            <div class=" team-member andreas col-md-4   col-sm-6 ">
+                <h3>Andreas Burburan
+                </h3>
+                <p class="member-role">
+                    Front-end developer and Interaction Designer</p>
+                <p class="member-contact">a.burburan@gmail.com
+                </p>
+                <img src="img/farnoosh.jpg" alt="Andreas Burburan, front-end developer and interaction designer in the Online Ethics Canvas project"/>
+                <p>
+                    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quae si potest singula consolando levare, universa quo modo sustinebit? Teneo, inquit, finem illi videri nihil dolere. Ut proverbia non nulla veriora sint quam vestra dogmata.</p><p>Isto modo, ne si avia quidem eius nata non esset. Quod quidem iam fit etiam in Academia. Duo Reges: constructio interrete. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Dempta enim aeternitate nihilo beatior Iuppiter quam Epicurus.</p>
+            </div>
+            <div class=" team-member farnoosh col-md-4   col-sm-6 ">
+                <h3>Farnoosh Mohri
+                </h3>
+                <p class="member-role">
+                    Front-end developer and Interaction Designer</p>
+                <p class="member-contact">farnoosh@ethicscanvas.org
+                </p>
+                <img src="img/farnoosh.jpg" alt="Farnoosh Mohri, Concept developer and business development in the Online Ethics Canvas project"/>
+                <p>
+                    Farnoosh is an interaction designer and front-end developer. She has a great passion for technology and how it can empower us as humans. She has studied web and multimedia development and she has been involed in different design and development projects with start-ups at Innovation Park in Sweden.</p><p>Farnoosh believes that our global digital connection and engagement is a crucial part of the human experience. She has joined the Online Ethics Canvas team at ADAPT Centre, as a wish to create new possibilities through innovative digital content, and contribute to a better world.</p>
+            </div>
+        </div>
+        <!--  end of second .row .meet-the-team -->
+        <!-- ======================
+OUR PARTNERS
+=======================-->
+        <div class="row our-partners">
+            <h2>OUR PARTNERS</h2>
+            <div class="nonprofit col-md-3 col-sm-6">
+                <a href="http://adaptcentre.ie/"><h3>ADAPT Centre</h3>
                     <img src="icon/adapt_logo.png" alt="logo of ADAPT Centre"/>
-</a>
+                </a>
 
-                    <p>
-                    </p>
-                </div>
-                <div class="inclusive col-md-3 col-md-6">
-                  <a href="https://www.tcd.ie/"><h3>Trinity College Dublin</h3>
+                <p>
+                </p>
+            </div>
+            <div class="inclusive col-md-3 col-md-6">
+                <a href="https://www.tcd.ie/"><h3>Trinity College Dublin</h3>
                     <img src="icon/TCD_logo.png" alt="logo of Trinity College Dublin"/></a>
 
-                    <p>
-                    </p>
-                </div>
-                <div class="open-source col-md-3 col-sm-6">
-                      <a href="http://www.dcu.ie/"><h3>Dublin City University</h3>
+                <p>
+                </p>
+            </div>
+            <div class="open-source col-md-3 col-sm-6">
+                <a href="http://www.dcu.ie/"><h3>Dublin City University</h3>
                     <img src="icon/DCU_logo.png" alt="logo of Dublin City University"/></a>
 
-                    <p>
-                    </p>
-                </div>
-                <div class=" data-privacy col-md-3 col-sm-6 ">
-                  <a href="http://www.sfi.ie/"><h3>Science Foundation Ireland</h3>
-                  <img src="icon/SFI_logo.png" alt="logo of Science Foundation Ireland"/></a>
+                <p>
+                </p>
+            </div>
+            <div class=" data-privacy col-md-3 col-sm-6 ">
+                <a href="http://www.sfi.ie/"><h3>Science Foundation Ireland</h3>
+                    <img src="icon/SFI_logo.png" alt="logo of Science Foundation Ireland"/></a>
 
 
-                    <p>
-                    </p>
-                </div>
-
+                <p>
+                </p>
             </div>
-            <!-- end of .row .our-values -->
-            <!-- =========================
-                  Embedding Mailchimp
-             =========================== -->
-            <div id="mc_embed_signup" class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
-                <form action="//ethicscanvas.us13.list-manage.com/subscribe/post?u=53efa44306740eee9f381db25&amp;id=7d7866e017" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
-                    <div id="mc_embed_signup_scroll">
-                        <h2>
-                            <!-- aria-hidden="true" attribute for accessibility of icons (hide the decorative icons from the screen reader) -->
-                            <span class="envelope-icon glyphicon glyphicon-envelope
-" aria-hidden="true"></span>Subscribe to the Ethics Canvas mailing list</h2>
-                        <div class="mc-field-group">
-                            <label for="mce-FNAME">First Name
-                            </label>
-                            <input type="text" value="" name="FNAME" class="required" id="mce-FNAME">
-                            <label for="mce-LNAME">Last Name
-                            </label>
-                            <input type="text" value="" name="LNAME" class="required" id="mce-LNAME">
-                            <label for="mce-EMAIL">Email Address
-                            </label>
-                            <input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
-                        </div>
-                        <div id="mce-responses" class="clear">
-                            <div class="response" id="mce-error-response" style="display:none"></div>
-                            <div class="response" id="mce-success-response" style="display:none"></div>
-                        </div>
-                        <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
-                        <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_53efa44306740eee9f381db25_7d7866e017" tabindex="-1" value=""></div>
-                        <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button Subscribe"></div>
+
+        </div>
+        <!-- end of .row .our-values -->
+        <!-- =========================
+Embedding Mailchimp
+=========================== -->
+        <div id="mc_embed_signup" class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
+            <form action="//ethicscanvas.us13.list-manage.com/subscribe/post?u=53efa44306740eee9f381db25&amp;id=7d7866e017" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
+                <div id="mc_embed_signup_scroll">
+                    <h2>
+                        <!-- aria-hidden="true" attribute for accessibility of icons (hide the decorative icons from the screen reader) -->
+                        <span class="envelope-icon glyphicon glyphicon-envelope
+                                     " aria-hidden="true"></span>Subscribe to the Ethics Canvas mailing list</h2>
+                    <div class="mc-field-group">
+                        <label for="mce-FNAME">First Name
+                        </label>
+                        <input type="text" value="" name="FNAME" class="required" id="mce-FNAME">
+                        <label for="mce-LNAME">Last Name
+                        </label>
+                        <input type="text" value="" name="LNAME" class="required" id="mce-LNAME">
+                        <label for="mce-EMAIL">Email Address
+                        </label>
+                        <input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
                     </div>
-                </form>
-            </div>
-            <!-- End of Mailchimp -->
+                    <div id="mce-responses" class="clear">
+                        <div class="response" id="mce-error-response" style="display:none"></div>
+                        <div class="response" id="mce-success-response" style="display:none"></div>
+                    </div>
+                    <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
+                    <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_53efa44306740eee9f381db25_7d7866e017" tabindex="-1" value=""></div>
+                    <div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button Subscribe"></div>
+                </div>
+            </form>
+        </div>
+        <!-- End of Mailchimp -->
 
-            <!-- FOOTER -->
-            <div class="row">
+        <!-- FOOTER -->
+        <div class="row">
 
-              <footer class="col-md-12 text-center">
+            <footer class="col-md-12 text-center">
                 <div class="contact">
-                  <h2>Contact us:</h2>
-                  <p> hello@ethicscanvas.org  </p>
+                    <h2>Contact us:</h2>
+                    <p> hello@ethicscanvas.org  </p>
                 </div>
-                  <div class="license">
-                      <p>The Ethics Canvas is adapted from Alex Osterwalder’s Business Model Canvas.</p>
-                      <p>The Business Model Canvas is designed by: Business Model Foundry AG.
-                      </p>
-                      <p>
-                          This work is licensed under the Creative Commons Attribution-Share Alike 3.0 unported license.</p>
-                        <p class="cc"><span class="glyphicon glyphicon-list" aria-hidden="true"></span> View a copy of this license on:</p>
-                      <p>
+                <div class="license">
+                    <p>The Ethics Canvas is adapted from Alex Osterwalder’s Business Model Canvas.</p>
+                    <p>The Business Model Canvas is designed by: Business Model Foundry AG.
+                    </p>
+                    <p>
+                        This work is licensed under the Creative Commons Attribution-Share Alike 3.0 unported license.</p>
+                    <p class="cc"><span class="glyphicon glyphicon-list" aria-hidden="true"></span> View a copy of this license on:</p>
+                    <p>
                         <a href="https://creativecommons.org/licenses/by-sa/3.0/">creativecommons.org</a>
 
-                      </p>
-                      <p class="bmc"><span class="glyphicon glyphicon-th-large" aria-hidden="true"></span>
-                          View the original Business Model Canvas on:
-                      </p>
-                      <p>
+                    </p>
+                    <p class="bmc"><span class="glyphicon glyphicon-th-large" aria-hidden="true"></span>
+                        View the original Business Model Canvas on:
+                    </p>
+                    <p>
                         <a href="https://strategyzer.com/canvas">strategyzer.com</a>
-                      </p>
-                  </div>
-                   <div class="license-icons">
-                     <ul>
-                       <li><img src="icon/by.large.png" alt="ethics-canvas-by-icon"/> </li>
-                          <li><img src="icon/share.large.png" alt="ethics-canvas-share-icon"/> </li>
-                       <li><img src="icon/cc.large.png" alt="ethics-canvas-cc-icon"/> </li>
-                       <li> <img src="icon/remix.large.png" alt="ethics-canvas-remix-icon"/></li>
-                       <li> <img src="icon/sa.large.png" alt="ethics-canvas-sa-icon"/></li>
-                     </ul>
-                   </div>
-                    <p class="ethics-copy terms"><a href="privacy-terms/terms.html">Terms of Service</a></p>
-                    <p class="ethics-copy privacy"><a href="privacy-terms/privacy.html">Privacy Policy</a></p>
-
-                    <p class="ethics-copy">The ADAPT Centre for Digital Content Technology</p> <p class="ethics-copy">is funded under the SFI Research Centres Programme (Grant 13/RC/2106).</p><p class="ethics-copy">It is co-funded under the European Regional Development Fund.</p>
-                    <p class="ethics-copy">Ethics Canvas v1.7|&copy; ADAPT Center & Trinity College Dublin & Dublin City University, 2016</p>
-              </footer>
-            </div>
+                    </p>
+                </div>
+                <div class="license-icons">
+                    <ul>
+                        <li><img src="icon/by.large.png" alt="ethics-canvas-by-icon"/> </li>
+                        <li><img src="icon/share.large.png" alt="ethics-canvas-share-icon"/> </li>
+                        <li><img src="icon/cc.large.png" alt="ethics-canvas-cc-icon"/> </li>
+                        <li> <img src="icon/remix.large.png" alt="ethics-canvas-remix-icon"/></li>
+                        <li> <img src="icon/sa.large.png" alt="ethics-canvas-sa-icon"/></li>
+                    </ul>
+                </div>
+                <p class="ethics-copy terms"><a href="privacy-terms/terms.html">Terms of Service</a></p>
+                <p class="ethics-copy privacy"><a href="privacy-terms/privacy.html">Privacy Policy</a></p>
+
+                <p class="ethics-copy">The ADAPT Centre for Digital Content Technology</p> <p class="ethics-copy">is funded under the SFI Research Centres Programme (Grant 13/RC/2106).</p><p class="ethics-copy">It is co-funded under the European Regional Development Fund.</p>
+                <p class="ethics-copy">Ethics Canvas v1.8&nbsp;|&nbsp;&copy; ADAPT Centre &amp; Trinity College Dublin &amp; Dublin City University, 2017</p>
+            </footer>
         </div>
         <!-- end of outer container-fluid -->
 

php/db_utils.php

@@ -1,8 +1,16 @@
 <?php
-    /*
     // Connect to the MySQL database
     function db_connect() {
         
+        $database = mysqli_connect("localhost", "mysqluser", "mysqlpassword", "ethicscanvas");
+        
+        if(!$database) {
+            throw new Exception(mysqli_connect_errno() . ": " . mysqli_connect_error());
+        }
+        
+        return $database;
+        
+        /*
         include('config.php');
         if(isset($db_host, $db_username, $db_password, $db_name)) {
             // Create connection to database
@@ -16,29 +24,22 @@
         }
         
         return $conn;
+         */
     }
-     */
     
-    /*
     // Closes the connection to the database
     function db_close($conn) {
-        $conn->close();
-    }
-     */
-    
-    // Connect to the database
-    function databaseConnect() {
-        $database = mysqli_connect("localhost", "mysqluser", "mysqlpassword", "ethicscanvas");
-        
-        if(!$database) {
+        /*
+        if(!mysqli_close($inDatabase)) {
             throw new Exception(mysqli_connect_errno() . ": " . mysqli_connect_error());
         }
+         */
         
-        return $database;
+        $conn->close();
     }
     
     // Run query with a return
-    function databaseQueryWithReturn($inDatabase, $inQuery) {
+    function db_query_return($inDatabase, $inQuery) {
         if(!$recordSet = mysqli_query($inDatabase, $inQuery)) {
             throw new Exception(mysqli_errno($inDatabase) . ": " . mysqli_error($inDatabase));
         }
@@ -47,16 +48,9 @@
     }
     
     // Run query without any return
-    function databaseQueryNoReturn($inDatabase, $inQuery) {
+    function db_query_no_return($inDatabase, $inQuery) {
         if(!mysqli_query($inDatabase, $inQuery)) {
             throw new Exception(mysqli_errno($inDatabase) . ": " . mysqli_error($inDatabase));
         }
     }
-  
-    // Close the connection to the database
-    function databaseClose($inDatabase) {
-        if(!mysqli_close($inDatabase)) {
-            throw new Exception(mysqli_connect_errno() . ": " . mysqli_connect_error());
-        }
-    }
 ?>

php/log-in.php

@@ -1,50 +1,50 @@
 <?php
-  /* Authenticates the user or returns error if the credentials are not correct */
-
-  $params = array(); 
-  parse_str($_POST['sign_in_data'], $params);
-
-  if(!array_key_exists('email-login', $params) || !array_key_exists('password-login', $params)) {
-    echo 400; // Missing parameters
-  }
-  else {
-    // Retrieve user credentials
-    $email = $params['email-login'];
-    $password = $params['password-login'];
-
-    require_once('db_utils.php');
-    $conn = db_connect(); // Connect to the database
-
-    // Check if the username already exists
-    if(!($result = mysqli_query($conn, "SELECT * FROM user WHERE username = '$email'"))) {
-      echo 400; // Wrong query
+    /* Authenticates the user or returns error if the credentials are not correct */
+    
+    $params = array(); 
+    parse_str($_POST['sign_in_data'], $params);
+    
+    if(!array_key_exists('email-login', $params) || !array_key_exists('password-login', $params)) {
+        echo 400; // Missing parameters
     }
     else {
-      if(mysqli_num_rows($result) != 1) { // User not registered or duplicated
-        echo 401;
-      }
-      else {
-        $row = mysqli_fetch_array($result, MYSQLI_ASSOC);
-        mysqli_free_result($result);
-        $activated = $row['activated'];
-        if($activated == FALSE)
-          echo 402; // Email not activated
-        else { // Email verified
-          $hash = $row['password'];
-          $full_salt = substr($hash, 0, 29);
-          $new_hash = crypt($password, $full_salt);
-          if ($hash == $new_hash) {
-            session_start(); // Start session for this user
-            $_SESSION['userlogin'] = $email; // Save email in the session
-            echo 200; // Authentication successful
-          }
-  	  else
-            echo 401; // Wrong username or password
+        // Retrieve user credentials
+        $email = $params['email-login'];
+        $password = $params['password-login'];
+        
+        require_once('db_utils.php');
+        $conn = db_connect(); // Connect to the database
+        
+        // Check if the username already exists
+        if(!($result = mysqli_query($conn, "SELECT * FROM user WHERE username = '$email'"))) {
+            echo 400; // Wrong query
         }
-      }
-    }
-
-    mysqli_free_result($result);
-    db_close($conn); // Close the database
-  } 
-?>
+        else {
+            if(mysqli_num_rows($result) != 1) { // User not registered or duplicated
+                echo 401;
+            }
+            else {
+                $row = mysqli_fetch_array($result, MYSQLI_ASSOC);
+                mysqli_free_result($result);
+                $activated = $row['activated'];
+                if($activated == FALSE)
+                    echo 402; // Email not activated
+                else { // Email verified
+                    $hash = $row['password'];
+                    $full_salt = substr($hash, 0, 29);
+                    $new_hash = crypt($password, $full_salt);
+                    if ($hash == $new_hash) {
+                        session_start(); // Start session for this user
+                        $_SESSION['userlogin'] = $email; // Save email in the session
+                        echo 200; // Authentication successful
+                    }
+                    else
+                        echo 401; // Wrong username or password
+                }
+            }
+        }
+        
+        mysqli_free_result($result);
+        db_close($conn); // Close the database
+    } 
+?>