Merge branch 'master' of github.com:tla/stemmatology

[scpubgit/stemmaweb.git] / root / src / relate.tt

diff --git a/root/src/relate.tt b/root/src/relate.tt
index 49afb7b..95af6d6 100644 (file)
--- a/root/src/relate.tt
+++ b/root/src/relate.tt
@@ -1,6 +1,6 @@
 [% WRAPPER header.tt
        pagetitle = "Stemmaweb - Relationship mapper"
-       applicationjs = c.uri_for('/js/relationship.js')
+       applicationjs = c.uri_for("/js/relationship-" _ permission _ ".js")
        applicationstyle = c.uri_for('/css/relationship.css')
 %]
 <script type="text/javascript">
@@ -13,7 +13,7 @@ $(document).ready(function () {
 
        <div id="topbanner">
                <div id="bannerinfo">
-                       <a href="help/[% text_lang %]" title="Relationship mapper help" class="helptag">Help / About</a>
+                       <a href="help/[% text_lang %]" title="Relationship mapper help" class="helptag">Help / About</a> | <a href="[% c.uri_for( '/' ) %]?withtradition=[% textid %]" class="navlink">Return to index</a>
                </div>
                <h1>Relationship mapper</h1>
                <h2>[% text_title %]</h2>
@@ -85,12 +85,18 @@ $(document).ready(function () {
                        <label for="reading_grammar_invalid">This word's grammar cannot be right</label>
                        <br/><br/>
                        <!-- Morphological options go here -->
-                       <label for="reading_normal_form">Normalized form: </label>
-                       <input type="text" name="reading_normal_form" id="reading_normal_form"></input>
-                       <button id="#reading_relemmatize" onclick="relemmatize(); return false;">Re-lemmatize</button>
+                       <div id="normalization">
+                               <label for="reading_normal_form">Normalized form: </label>
+                               <input type="text" name="reading_normal_form" id="reading_normal_form"></input>
+                               <button id="#reading_relemmatize" onclick="relemmatize(); return false;">Re-lemmatize</button>
+                       </div>
+                       <div id="relemmatize_pending">
+                               <img src="[% c.uri_for('/images/ajax-loader.gif') %]"/>
+                       </div>
                        <br/><br/>
-                       <label>Lemma / part of speech:</label><br/>
-                       <div id="morphology">
+                       <div id="morph_outer">
+                               <label>Lemma / part of speech:</label><br/>
+                               <div id="morphology"></div>
                        </div>
                        </select>
                        <div id="reading_status"></div>