Modified.

eddersko · Dec 31, 2014 · 4a6fc33 · 4a6fc33
1 parent 6350883
commit 4a6fc33
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 69 deletions.
diff --git a/ICLDC.png b/ICLDC.png
diff --git a/default.html b/default.html
@@ -1,6 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-    
+
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -10,71 +9,65 @@
     <meta name="copyright" content="Edwin Ko Copyright (c) 2014" />
     <link rel="stylesheet" href="css/foundation.css" />
     <script src="js/modernizr.js"></script>
-    <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-54106816-4', 'auto');
-  ga('send', 'pageview');
-
-</script>
 </head>
 
 <body>
-
-    <style type="text/css">body{font-family:'Raleway',sans-serif;font-size:18px;}hr{text-align:center;margin:0 auto;opacity:0.5;}ul{text-transform:uppercase;}ul.inline-list.right{text-transform:none;}ul.inline-list.right a{color:#000;}ul.inline-list.right a:hover{color:rgba(0,0,0,0.5);}h1{font-family:'Raleway','Helvetica Neue',Helvetica,Courier,Monaco,mono;font-size:32px;color:#fff;line-height:28px;margin-top:16px;margin-bottom:0px;text-align:center;}h2{font-family: 'Raleway', Courier,Monaco,mono;color:#fff;font-size:36px;line-height:34px;}h3{font-family:'Raleway','Helvetica Neue',Courier,Monaco,mono;font-size:24px;color:#fff;line-height:20px;text-align:center;font-weight:500;padding-bottom:10px;}h4{font-family:'Raleway','Helvetica Neue',Courier,Monaco,mono;color:#000;font-size:28px;padding-top:5px;}.columns.large-centered{padding-left:5px;padding-right:5px;}@media only screen and (max-width: 40em) {.columns.large-centered{font-size:13px;}}@media only screen and (min-width: 40.063em) {.columns.large-centered{font-size:14px;}}.about-box{color:#fff;}.black-box{background-color:rgba(0,0,0,0.55);padding:35px;font-weight:900; }.black-box p{font-weight:900;}.secondary.small.button{background-color:transparent;color:#fff;border:2px #fff solid;border-radius:5px;padding:15px 50px 15px 50px;margin:0;}.secondary.small.button:hover{background-color:rgba(255,255,255,0.5);}.row .main-wrapper{color:#fff;}.about-content{background-color:#fff;box-shadow:2px 2px 10px rgba(0,0,0,0.1);}.button-group li .button{border:0!important;}.button{-webkit-appearance:none;background-color:transparent;border-width:0;text-align:center;box-shadow:0 0 0;}.button:hover{color:rgba(255,255,255,0.7);background-color:transparent;}footer p,footer a{font-size:14px;}.hero{padding-bottom:50px;background-color:gray;background-size:cover;box-shadow:inset 0px 0px 0 2000px rgba(0,0,0,0.2);}.hero-content{padding-top:40px;padding-bottom:40px;background-color:#EAEAEA;}.panel{margin:40px 0 40px 0;box-shadow:2px 2px 10px rgba(0,0,0,0.2);border:none;background-color:#EAEAEA;}.large-4 img{box-shadow:2px 2px 10px rgba(0,0,0,0.1);}.radius.right.button{color:#000;border:2px #000 solid;border-radius:5px;padding:15px 50px 15px 50px;margin:0;font-size:0.8125em;}@media only screen and (min-width: 64.063em) {.radius.right.button{color:#000;border:2px #000 solid;border-radius:5px;padding:15px 50px 15px 50px;margin-top:25px;font-size:0.8125em;}}@media only screen and (min-width: 40.063em) {.radius.right.button{color:#000;border:2px #000 solid;border-radius:5px;padding:15px 50px 15px 50px;margin-top:25px;font-size:0.8125em;}}.radius.right.button:hover{background-color:rgba(0,0,0,0.1);}</style>
+    <br>
+
+    <div class="row">
+        <div class="large-12 column">
+
 
-
-
-    <section class="hero">
-      <div class="row">
-        <div class="large-12 columns">
-          <div class="main-wrapper">
-            <h1>TEMPLATE</h1>
-            <h3>Multi-layered Language Learning Resources</h3>
-            <hr>
-          </div>
-        </div>
-      </div>
-        <br>
-      <div class="row">
-        <div class="large-6 columns about-box">
-          <div class="black-box">
-            <h2>Welcome</h2>
-            <p>This is a template for multi-layered language learning resources to aid language revitalization efforts. It will be presented at the 4th International Conference of Language Documentation and Conservation in Honolulu, Hawai'i in February 2015. <p>Stay tuned!
-            </p> 
-            <a href="http://eddersko.github.io/template/" class="secondary small button">Learn More</a>
-          </div>
         </div>
-          <div class="large-6 columns">
-              <br>
-
-          <a href="http://icldc4.weebly.com/"><img src="ICLDC.png" alt="ICLDC logo" align="right"/></a>
-          </div>
-      </div>
-    </section>
-
+    </div>
     <div class="row">
-      <div class="large-12 columns">
-
-        <div class="panel">
-
-          <div class="row">
-            <div class="large-9 columns">
-              <h4>Get in touch!</h4>
-              <p>We will get back to you as soon as possible!</p>
-            </div>
-            <div class="large-3 columns">
-              <a href="mailto:ek684@georgetown.edu" class="radius button right">Contact Us</a>
+        <div class="large-6 columns">
+<br><br>
+            <!-- This is where you can enter in your own picture. -->
+            <img src="placeholder.png" width="500px" height="500px" maxwidth="70%">
+            <br>
+            <a id="manual" href="http://eddersko.github.io/template/"><small>Documentation</small></a>
+        </div>
+
+        <div class="large-6 columns">
+
+        <br>
+            <div id="menu">
+                <h1 id="title-head" style="text-align:right">Template for Multi-Layered Language Resources</h1>
+            <br />
+
+                <!-- Menu links -->
+                <a class="menu" href="./about">about these materials</a>
+                <br />
+                <br />
+                <a class="menu" href="./apps">links to mobile apps</a>
+                <br/>
+                <br />
+                <a class="menu" href="./sounds">sounds and letters</a>
+                <br/>
+                <br />
+                 <a class="menu" href="./expressions">everyday expressions</a>
+                <br />
+                <br />
+                <a class="menu" href="./dictionary">talking dictionary</a>
+                <br />
+                <br />
+                <a class="menu" href="./phrasicon">phrasicon</a>
+                <br />
+                <br />
+                <a class="menu" href="./structure">basic sentence structures</a>
+                <br />
+                <br />
+                <a class="menu" href="./texts">stories and texts</a>
+                <br />
+                <br />
+                <a class="menu" href="./contact">contact</a> 
             </div>
-          </div>
+
         </div>
-
-      </div>
+
     </div>
-      
+
 </body>
 
 </html>
diff --git a/dictionary/background.jpg b/dictionary/background.jpg
diff --git a/dictionary/category.php b/dictionary/category.php
@@ -300,7 +300,7 @@
         </div>
 
         <!-- Background image. -->
-        <p><img src="background.jpg"/></p>    
+        <p><img src="background_dictionary.jpg"/></p>    
 
     </div>
     </div>

diff --git a/dictionary/error_log b/dictionary/error_log
@@ -142,3 +142,7 @@
 [29-Nov-2014 14:32:30 America/Denver] PHP Notice:  Undefined variable: warning in /home1/eddersko/public_html/template/dictionary/category.php on line 313
 [29-Nov-2014 14:32:30 America/Denver] PHP Notice:  Undefined variable: form in /home1/eddersko/public_html/template/dictionary/category.php on line 314
 [29-Dec-2014 20:21:25 America/Denver] PHP Warning:  DOMDocument::load(): XML declaration allowed only at the start of the document in /home1/eddersko/public_html/template/dictionary/dictionary.xml, line: 2 in /home1/eddersko/public_html/template/dictionary/index.php on line 1
+[30-Dec-2014 13:12:24 America/Denver] PHP Warning:  DOMDocument::load(): XML declaration allowed only at the start of the document in /home1/eddersko/public_html/template/dictionary/dictionary.xml, line: 2 in /home1/eddersko/public_html/template/dictionary/index.php on line 1
+[30-Dec-2014 13:12:26 America/Denver] PHP Warning:  DOMDocument::load(): XML declaration allowed only at the start of the document in /home1/eddersko/public_html/template/dictionary/dictionary.xml, line: 2 in /home1/eddersko/public_html/template/dictionary/index.php on line 1
+[30-Dec-2014 13:43:20 America/Denver] PHP Warning:  DOMDocument::load(): XML declaration allowed only at the start of the document in /home1/eddersko/public_html/template/dictionary/dictionary.xml, line: 2 in /home1/eddersko/public_html/template/dictionary/index.php on line 1
+[31-Dec-2014 09:43:59 America/Denver] PHP Warning:  DOMDocument::load(): XML declaration allowed only at the start of the document in /home1/eddersko/public_html/template/dictionary/dictionary.xml, line: 2 in /home1/eddersko/public_html/template/dictionary/index.php on line 1
diff --git a/dictionary/index.php b/dictionary/index.php
@@ -138,7 +138,7 @@
 
             <p>
                 <!-- Background image. -->
-                <img src="background.jpg" />
+                <img src="background_dictionary.jpg" />
             </p>
 
         </div>

diff --git a/dictionary/word.php b/dictionary/word.php
@@ -230,7 +230,7 @@
 
             <p>
                 <!-- Background image. -->
-                <img src="background.jpg" />
+                <img src="background_dictionary.jpg" />
             </p>
 
             <!-- Search results here... -->

diff --git a/default2.html → index.html b/default2.html → index.html
diff --git a/owl-carousel/Thumbs.db b/owl-carousel/Thumbs.db
diff --git a/phrasicon/background.jpg b/phrasicon/background.jpg
diff --git a/phrasicon/category.php b/phrasicon/category.php
@@ -17,7 +17,7 @@
 
 // find stem from dictionary starting with leter ordered
 
-$result = $xpath->query("//entry[starts-with(stem, '$letter')]");    
+$result = $xpath->query("//entry/sense/cit[starts-with(quote, '$letter')]");    
 
 
 $xmlDoc = new DOMDocument();
@@ -211,7 +211,7 @@
                 </div>
 
                 <!-- Picture here. -->
-                <p><img src="background.jpg" />
+                <p><img src="background_phrasicon.jpg" />
                 </p>
 
             </div>

diff --git a/phrasicon/index.php b/phrasicon/index.php
@@ -157,7 +157,7 @@
 
             <p>
                 <!-- Picture here. -->
-                <img src="background.jpg" />
+                <img src="background_phrasicon.jpg" />
             </p>
 
         </div>

diff --git a/phrasicon/update/inject.php b/phrasicon/update/inject.php
@@ -79,10 +79,10 @@
 for ($x=1; $x<13; $x++) {
 
     $m = $_POST['morphoss' . $x];
-    if ($g != '') {
+    if ($m != '') {
     $result = $phrasicon->xpath("/phrasicon/phrase[@id='$id']");
     $result[0]->morpheme->m[$x-1] = $m;
-
+    $result[0]->morpheme->m[$x-1]->addAttribute('id', $id . "." . $x);
     }    
 
 }
@@ -96,7 +96,7 @@
     if ($g != '') {
     $result = $phrasicon->xpath("/phrasicon/phrase[@id='$id']");
     $result[0]->gloss->g[$x-1] = $g;
-
+    $result[0]->gloss->g[$x-1]->addAttribute('id', $id . "." . $x);
     }    
 
 }
@@ -109,7 +109,7 @@
     if ($extra != '') {
     $result = $phrasicon->xpath("/phrasicon/phrase[@id='$id']");
     $result[0]->extraAnno1->extra[$x-1] = $extra;
-    
+    $result[0]->extraAnno1->extra[$x-1]->addAttribute('id', $id . "." . $x)
     }    
     
 }

diff --git a/phrasicon/word.php b/phrasicon/word.php
@@ -297,7 +297,7 @@
             </div>
 
             <!-- Picture here. -->
-            <p><img src="background.jpg" />
+            <p><img src="background_phrasicon.jpg" />
             </p>
 
             <!-- Search results here. -->

diff --git a/placeholder.png b/placeholder.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -300,7 +300,7 @@ @@
             </div>
             <!-- Background image. -->
-            <p><img src="background.jpg"/></p>
+            <p><img src="background_dictionary.jpg"/></p>
         </div>
         </div>
@@ Expand Down @@