Remove the concept of Title (remaining from Evopedia archive structure).

As suggested in #218
kiwix · May 28, 2017 · c091922 · c091922
1 parent 2b7ff70
commit c091922
Show file tree

Hide file tree

Showing 8 changed files with 278 additions and 292 deletions.
diff --git a/browser-tests/nightwatch_runner.js b/browser-tests/nightwatch_runner.js
@@ -16,14 +16,14 @@ module.exports = {
             .execute(function() {
                 window.setRemoteArchive('https://kiwix.github.io/kiwix-html5/tests/wikipedia_en_ray_charles_2015-06.zim');
             })
-            .waitForElementVisible('#formTitleSearch', 20000)
-            .waitForElementVisible('#searchTitles', 20000)
+            .waitForElementVisible('#formArticleSearch', 20000)
+            .waitForElementVisible('#searchArticles', 20000)
             .setValue('#prefix', "Ray")
-            .click('#searchTitles')
-            .waitForElementVisible('#titleList', 20000)
+            .click('#searchArticles')
+            .waitForElementVisible('#articleList', 20000)
             .useXpath()
-            .waitForElementVisible("//div[@id='titleList']/a[text()='Ray Charles']", 20000)
-            .click("//div[@id='titleList']/a[text()='Ray Charles']")
+            .waitForElementVisible("//div[@id='articleList']/a[text()='Ray Charles']", 20000)
+            .click("//div[@id='articleList']/a[text()='Ray Charles']")
             .useCss()
             .frame('articleContent')
                 .waitForElementPresent('#mweQ', 2000000)

diff --git a/tests/tests.js b/tests/tests.js
diff --git a/www/css/app.css b/www/css/app.css
@@ -59,7 +59,7 @@
     padding-left: 1px !important;
 }
 
-#searchingForTitles .floating {
+#searchingForArticles .floating {
     position: relative;
     z-index: 10;
     top: 20px;

diff --git a/www/index.html b/www/index.html
@@ -66,13 +66,13 @@
 
 
                 <div class="container">
-                <form id="formTitleSearch">
+                <form id="formArticleSearch">
                     <div class="row">
                         <span class="nopadding col-md-offset-1 col-sm-offset-1 col-md-8 col-sm-8 col-xs-7">
                             <span class="input-group">
                                 <input type="search" id="prefix" placeholder="Search..." class="form-control" />
                                 <span class="input-group-btn">
-                                    <a class="btn btn-default" id="searchTitles"><span class="glyphicon glyphicon-search"></span></a>
+                                    <a class="btn btn-default" id="searchArticles"><span class="glyphicon glyphicon-search"></span></a>
                                 </span>
                             </span>
                         </span>
@@ -82,7 +82,7 @@
                             </span>
                         </span>
                     </div>
-                    <div id="searchingForTitles" class="floating" style="display: none;">
+                    <div id="searchingForArticles" class="floating" style="display: none;">
                         <img src="img/spinner.gif" alt="Please wait..." />
                     </div>
                 </form>
@@ -223,15 +223,9 @@ <h2>Expert settings</h2>
                 </div>
 
                 <!-- List of articles matching the typed prefix -->
-                <div id="titleListWithHeader" class="container">
-                    <span id="titleListHeaderMessage"></span>
-                    <span id="suggestEnlargeMaxDistance" style="display: none;">
-                        &nbsp;You can <a id="btnEnlargeMaxDistance">look more far away</a>
-                    </span>
-                    <span id="suggestReduceMaxDistance" style="display: none;">
-                        &nbsp;You can <a id="btnReduceMaxDistance">look closer</a> to your location
-                    </span>
-                    <div id="titleList" class="list-group">
+                <div id="articleListWithHeader" class="container">
+                    <span id="articleListHeaderMessage"></span>
+                    <div id="articleList" class="list-group">
                     </div>
                 </div>
                 <div id="readingArticle" style="display: none;" class="container">