Browse Source

Update window headers

Unknown 7 years ago
parent
commit
77956620bb
4 changed files with 24 additions and 12 deletions
  1. 6 1
      canvas/css/canvas.css
  2. 10 6
      canvas/index.php
  3. 3 0
      canvas/js/canvas.js
  4. 5 5
      index.html

+ 6 - 1
canvas/css/canvas.css

@@ -793,6 +793,11 @@ div.window button.close {
     top: -8px;
     font-size: 2.5em;
 }
+div.window h1 {
+    margin: 0 0 0.1em 0;
+    font-size: 2.4em;
+    line-height: 1.5;
+}
 div.window h2 {
     margin: 0 0 0.4em 0;
     font-size: 1.4em;
@@ -813,7 +818,7 @@ div.window .window-button {
     border: 0.12em solid rgb(51, 51, 51);
     border-radius: 0.5em;
 }
-div.tag-window .window-button:hover {
+div.window .window-button:hover {
     color: #ffffff;
     border-color: #ffffff;
 }

+ 10 - 6
canvas/index.php

@@ -873,16 +873,17 @@
                         <span aria-hidden="true">&times;</span>
                     </button>
                     <!-- <div id="tag-window-container"> -->
+                    <h1></h1>
                     <h2 id="tag-description">
-                        Tag description
+                        Tag Description
                     </h2>
                     <textarea rows="4" cols="50" maxlength="200" id="tag-description">Please enter a description...</textarea><br />
                     <p class="chars-count">
                         <span class="chars">200</span>
                         characters remaining
                     </p>
-                    <button type="button" class="window-button" id="save-tag">Save tag</button>&nbsp;
-                    <button type="button" class="window-button" id="delete-tag">Delete tag</button>
+                    <button type="button" class="window-button" id="save-tag">Save Tag</button>&nbsp;
+                    <button type="button" class="window-button" id="delete-tag">Delete Tag</button>
                     <h2 class="similar-tags">Similar tags by other users</h2>
                     <p class='similar-tags-description-none'>No similar tags could be found!</p>
                     <!-- </div> -->
@@ -894,17 +895,20 @@
                     <button type="button" class="close" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>
-                    <h2>
+                    <h1>
                         Collaborators
+                    </h1>
+                    <h2>
+                        List of Collaborators
                     </h2>
                     <table>
                     </table>
                     <label><input type="checkbox" name="show-only-active" /> Show only active collaborators</label><br />
                     <h2>
-                        Add collaborator
+                        Add Collaborator
                     </h2>
                     <input type="email" name="add-collaborator" value="Please enter an email address..." />
-                    <button type="button" class="window-button" id="add-collaborator">Add collaborator</button>
+                    <button type="button" class="window-button" id="add-collaborator">Add</button>
                     <div class="error-message" id="username-already-exists">The username already exists!</div>
                     <div class="error-message" id="enter-valid-email">Please enter a valid email address!</div>
                 </div>

+ 3 - 0
canvas/js/canvas.js

@@ -818,6 +818,9 @@ $(document).ready(function() {
         $("div#shadow").css("display", "block");
         $("div#tag-window").css("display", "block");
         
+        // Update the header
+        $("div#tag-window h1").text(tag);
+        
         // Move the window to the centre of the screen
         /*
         The code below should be working, but the height of the second selector seems completely wrong!

+ 5 - 5
index.html

@@ -421,19 +421,19 @@ MEAT THE TEAM
                 <h3>Andreas Burburan
                 </h3>
                 <p class="member-role">
-                    Front-end developer and Interaction Designer</p>
+                    Web 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"/>
+                <img src="img/farnoosh.jpg" alt="Andreas Burburan, web 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>
-                <!--
-                    Andreas is a front-end developer and interaction designer. I study web development at Karlstad University in Karlstad, Sweden. Few things delight me more than elegantly solving logical problems, while building beautiful and effective interactive products that deliver value to the client. With a tireless devotion, I also thrive under pressure, and most of all where I grow as a professional and human being. This desire for learning has motivated me to apply for an internship in the Ethics Canvas project, where I hope to fully utilise my skills in HTML, CSS, JavaScript and more—while contributing to the great work that I can already tell is being done. I am convinced that I will be a valuable asset for the Ethics Project, given my unusually wide range of skills.
+                    <!--
+                    Andreas is a web developer and interaction designer. I study web development at Karlstad University in Karlstad, Sweden. Few things delight me more than elegantly solving logical problems, while building beautiful and effective interactive products that deliver value to the client. With a tireless devotion, I also thrive under pressure, and most of all where I grow as a professional and human being. This desire for learning has motivated me to apply for an internship in the Ethics Canvas project, where I hope to fully utilise my skills in HTML, CSS, JavaScript and more—while contributing to the great work that I can already tell is being done. I am convinced that I will be a valuable asset for the Ethics Project, given my unusually wide range of skills.
                     
                     He has also long cultivated a keen interest in interaction and graphic design, with many years of experience in several areas related to advertising production including graphic design, image editing, 3D modelling and markup using HTML and CSS.
                     
                     I look forward to hearing from you soon!
-                -->
+                    -->
             </div>
             <div class=" team-member farnoosh col-md-4   col-sm-6 ">
                 <h3>Farnoosh Mohri