- Added tag help text

- Update tag buttons / tag help text based on availability of tags - Use cursor pointer for buttons in translation wizard - Update list of available translations each time a translation is added/removed - Added empty default database
ezra-bible-app · Feb 3, 2019 · 77b24d6 · 77b24d6
1 parent a19b55b
commit 77b24d6
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 11 deletions.
diff --git a/app/bible_browser/bible_browser_controller.js b/app/bible_browser/bible_browser_controller.js
@@ -508,6 +508,10 @@ function BibleBrowserController() {
   };
 
   this.handle_book_menu_click = function(event) {
+    if ($('.book-select-button').hasClass('ui-state-disabled')) {
+      return;
+    }
+
     if (bible_browser_controller.book_menu_is_opened) {
       bible_browser_controller.handle_body_click();
     } else {
@@ -531,6 +535,10 @@ function BibleBrowserController() {
   };
 
   this.handle_tag_menu_click = function(event) {
+    if ($('.tag-select-button').hasClass('ui-state-disabled')) {
+      return;
+    }
+
     if (bible_browser_controller.tag_menu_is_opened) {
       bible_browser_controller.handle_body_click();
     } else {
@@ -581,15 +589,20 @@ function BibleBrowserController() {
     }
   };
 
-  this.bind_events_after_bible_text_loaded = function() {
+  this.bind_events_after_bible_text_loaded = async function() {
     $('.cr-info').filter(":not('.tag-events-configured')").bind('click', bible_browser_controller.handle_cross_reference_click).addClass('tag-events-configured');
     $('.tag-box, .cr-box').filter(":not('.tag-events-configured')").bind('click', tags_controller.clear_verse_selection).addClass('tag-events-configured');
     $('.tag').filter(":not('.tag-events-configured')").bind('click', bible_browser_controller.handle_tag_reference_click).addClass('tag-events-configured');
 
     if (bible_browser_controller.text_is_book) {
+      var tagsCount = await models.Tag.getTagCount();
       var book_tag_statistics_button = $('#show-book-tag-statistics-button');
-      book_tag_statistics_button.removeClass('ui-state-disabled');
-      book_tag_statistics_button.removeClass('events-configured');
+
+      if (tagsCount > 0) {
+        book_tag_statistics_button.removeClass('ui-state-disabled');
+        book_tag_statistics_button.removeClass('events-configured');
+      }
+
       book_tag_statistics_button.bind('click', function() {
         bible_browser_controller.open_book_tag_statistics(); 
       });

diff --git a/app/bible_browser/translation_wizard.js b/app/bible_browser/translation_wizard.js
@@ -264,9 +264,10 @@ class TranslationWizard {
     return this._translationInstallStatus != 'IN_PROGRESS';
   }
 
-  addTranslationWizardFinished(event, currentIndex) {
+  async addTranslationWizardFinished(event, currentIndex) {
     $('#translation-settings-wizard').dialog('close');
 
+    this._installedTranslations = await models.BibleTranslation.getTranslations();
     $('#bible-select').removeAttr('disabled');
     initTranslationsMenu();
   }
@@ -323,6 +324,7 @@ class TranslationWizard {
             $("select#bible-select").empty();
             initTranslationsMenu();
             updateNavMenu();
+            tags_controller.updateTagUiBasedOnTagAvailability();
           });
         }
 
@@ -338,8 +340,9 @@ class TranslationWizard {
     return this._translationRemovalStatus != 'IN_PROGRESS';
   }
 
-  removeTranslationWizardFinished(event, currentIndex) {
+  async removeTranslationWizardFinished(event, currentIndex) {
     $('#translation-settings-wizard').dialog('close');
+    this._installedTranslations = await models.BibleTranslation.getTranslations();
     initTranslationsMenu();
   }
 

diff --git a/app/tags/tags_communication_controller.js b/app/tags/tags_communication_controller.js
@@ -81,7 +81,7 @@ function TagsCommunicationController()
     });
   };
 
-  this.destroy_tag = function(id) {
+  this.destroy_tag = async function(id) {
     models.VerseTag.destroy({
       where: {
         tagId: id

diff --git a/app/tags/tags_controller.js b/app/tags/tags_controller.js
@@ -248,6 +248,10 @@ function TagsController() {
   };
 
   this.handle_new_tag_button_click = function(button, type) {
+    if ($(button).hasClass('ui-state-disabled')) {
+      return;
+    }
+
     $('#new-' + type + '-tag-title-input').val(''); 
     $('#new-' + type + '-tag-dialog').dialog('open');
     $('#new-' + type + '-tag-title-input').focus();
@@ -294,8 +298,9 @@ function TagsController() {
     $('#delete-meta-tag-confirmation-dialog').dialog('close');
   };
 
-  this.delete_tag_after_confirmation = function() {
-    tags_controller.communication_controller.destroy_tag(tags_controller.tag_to_be_deleted);
+  this.delete_tag_after_confirmation = async function() {
+    await tags_controller.communication_controller.destroy_tag(tags_controller.tag_to_be_deleted);
+    await tags_controller.updateTagUiBasedOnTagAvailability();
     $('#delete-tag-confirmation-dialog').dialog('close');
   };
 
@@ -656,7 +661,7 @@ function TagsController() {
     return $('#tags-search-input')[0].empty();
   };
 
-  this.render_tags = function(tag_list) {
+  this.render_tags = async function(tag_list) {
     var book_content_header = $($('#tags-content').find('.ui-accordion-header')[1]);
     var global_tags_box = $('#tags-content-global');
     var book_tags_box = $('#tags-content-book');
@@ -681,6 +686,8 @@ function TagsController() {
     var current_filter = $('#tags-search-input').val();
     var book_tag_statistics = new Array();
 
+    await tags_controller.updateTagUiBasedOnTagAvailability();
+
     for (var i = 0; i < tag_list.length; i++) {
       var current_tag = tag_list[i];
       var current_tag_title = current_tag.title;
@@ -1528,7 +1535,7 @@ function TagsController() {
     new_reference_link.append(tags_search_input);
   };
 
-  this.init_ui = function() {
+  this.init_ui = async function() {
     $('#tags-content').accordion({
       autoHeight: false,
       animated: false,
@@ -1562,6 +1569,30 @@ function TagsController() {
     $('#tags-search-input').bind('keydown', function(e) {
       e.stopPropagation(); 
     });
+
+    await tags_controller.updateTagUiBasedOnTagAvailability();
+  };
+
+  this.updateTagUiBasedOnTagAvailability = async function() {
+    var translations = await models.BibleTranslation.getTranslations();
+    var translationCount = translations.length;
+    var tagsCount = await models.Tag.getTagCount();
+
+    if (tagsCount == 0) {
+      $('.tag-select-button').addClass('ui-state-disabled');
+      $('#show-book-tag-statistics-button').addClass('ui-state-disabled');
+
+      if (translationCount > 0) {
+        $('#tags-content-global').html(gettext_strings.help_text_no_tags_book_opened);
+      } else {
+        $('#new-standard-tag-button').addClass('ui-state-disabled');
+        $('#tags-content-global').html(gettext_strings.help_text_no_tags);
+      }
+    } else {
+      $('.tag-select-button').removeClass('ui-state-disabled');
+      $('#new-standard-tag-button').removeClass('ui-state-disabled');
+      $('#show-book-tag-statistics-button').removeClass('ui-state-disabled');
+    }
   };
 
   this.init = function() {

diff --git a/css/main.css b/css/main.css
@@ -619,6 +619,10 @@ h2 {
   float: left;
 }
 
+.fg-button {
+  cursor: pointer;
+}
+
 .display-options-button {
   width: 7.5em;
 }

diff --git a/ezra.sqlite b/ezra.sqlite
diff --git a/index.html b/index.html
@@ -68,7 +68,9 @@
   book_select_label		            : 'Select book',
   tagged_verses_for               : 'Verses tagged with ',
   help_text_no_translations       : 'To start using Ezra Project, first install at least one bible translation by clicking on "Configure translations" and then "Add bible translation".',
-  help_text_translation_available : 'To start using Ezra Project, select a book or a tag from the menu above.'
+  help_text_translation_available : 'To start using Ezra Project, select a book or a tag from the menu above.',
+  help_text_no_tags               : 'To start working with tags, first select a bible book to study.',
+  help_text_no_tags_book_opened   : 'To start working with tags, create your first tag by clicking on the button "New&nbsp;tag" above. After that you can browse the bible text, click or drag-select verses and then assign the tag you just created.'
 };
 
 var bible_books = [

diff --git a/init.js b/init.js
@@ -421,8 +421,10 @@ async function initTranslationsMenu()
 
     if (result.count == 0) {
       $('#bible-select').attr('disabled','disabled');
+      $('.book-select-button').addClass('ui-state-disabled');
       $('#verse-list').find('.help-text').text(gettext_strings.help_text_no_translations);
     } else if (bible_browser_controller.current_book == null && bible_browser_controller.current_tag_id_list == "")  {
+      $('.book-select-button').removeClass('ui-state-disabled');
       $('#verse-list').find('.help-text').text(gettext_strings.help_text_translation_available);
     }
 

diff --git a/models/tag.js b/models/tag.js
@@ -41,5 +41,11 @@ module.exports = (sequelize, DataTypes) => {
     return sequelize.query(query, { model: models.Tag });
   };
 
+  Tag.getTagCount = async function() {
+    var query = "SELECT id FROM Tags t";
+    var records = await sequelize.query(query, { model: models.Tag });
+    return records.length;
+  };
+
   return Tag;
 };