accurator/commit
broken commit-renaming controls in the navbar
author | Cristina-Iulia Bucur |
---|---|
Tue Nov 17 17:13:08 2015 +0100 | |
committer | Cristina-Iulia Bucur |
Tue Nov 17 17:13:08 2015 +0100 | |
commit | f27f5fd7a56ab8605cd796626f7dc0ee6bf12e27 |
tree | a3b16600de3e581087b7f113557d56847e5132d7 |
parent | af468b87f8d2abb69159deacfdac27bddb12b130 |
Diff style: patch stat
diff --git a/lib/accurator/annotate_page.pl b/lib/accurator/annotate_page.pl index 71212e1..aafd11f 100644 --- a/lib/accurator/annotate_page.pl +++ b/lib/accurator/annotate_page.pl @@ -76,27 +76,27 @@ navigation_bar --> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> - <ul class="nav navbar-nav navbar-right userDropdown"> + <ul class="nav navbar-nav navbar-right navbarLstUser"> </ul> - <div class="navbar-form navbar-nav" id="frmGroupSearch"> + <div class="navbar-form navbar-nav" id="navbarFrmSearch"> <div class="form-group"> - <input type="text" class="form-control" id="frmSearch"> + <input type="text" class="form-control" id="navbarInpSearch"> </div> - <button id="btnAnnotateSearch" class="btn btn-default"> + <button id="navbarBtnSearch" class="btn btn-default"> </button> </div> - <button class="btn navbar-btn navbar-right btn-primary" id="btnAnnotateRecommend"> + <button class="btn navbar-btn navbar-right btn-primary" id="navbarBtnRecommend"> </button> </div> </div> diff --git a/lib/accurator/ui_elements.pl b/lib/accurator/ui_elements.pl index ea42dec..dae609d 100644 --- a/lib/accurator/ui_elements.pl +++ b/lib/accurator/ui_elements.pl @@ -74,14 +74,14 @@ ui_predicate(UI, Predicate) :- % super class will be queried. get_text_element(UI, Locale, Predicate, Label-Literal) :- rdf(UI, Predicate, literal(lang(Locale, Literal))), - rdf(Predicate, rdf:type, auis:'UILabel'), + rdf(Predicate, rdfs:subPropertyOf, auis:uiLabel), !, iri_xml_namespace(Predicate, _, Label). get_text_element(UI, Locale, Predicate, Label-Literal) :- rdf(UI, rdfs:subClassOf, SuperUI), rdf(SuperUI, Predicate, literal(lang(Locale, Literal))), - rdf(Predicate, rdf:type, auis:'UILabel'), + rdf(Predicate,rdfs:subPropertyOf, auis:uiLabel), iri_xml_namespace(Predicate, _, Label). %% get_selector_options(UI, Locale, SelectorFields) diff --git a/rdf/domain/bird/ui/labels.ttl b/rdf/domain/bird/ui/labels.ttl index e8b7a02..ab1a2b5 100644 --- a/rdf/domain/bird/ui/labels.ttl +++ b/rdf/domain/bird/ui/labels.ttl @@ -10,15 +10,15 @@ abirui:domain a auis:UI ; aui:domainLabel "Bird domain"@en . -aui:domainLabel a auis:UILabel . +aui:domainLabel rdfs:subPropertyOf auis:uiLabel . ###### Bird Intro Screen ##### abirui:intro a auis:UI ; rdfs:subClassOf aui:intro; - aui:txtSubSlogan "Help us add information to artworks depicting birds"@en . + aui:headerSubSlogan "Help us add information to artworks depicting birds"@en . -abirui:txtSubSlogan a auis:UILabel . +aui:headerSubSlogan rdfs:subPropertyOf auis:uiLabel . ###### Bird About Screen ##### diff --git a/rdf/ui/labels.ttl b/rdf/ui/labels.ttl index f0e7b66..ad904b1 100644 --- a/rdf/ui/labels.ttl +++ b/rdf/ui/labels.ttl @@ -15,11 +15,11 @@ aui:intro a auis:UI ; aui:buttonLogin "or Log in"@en ; aui:linkAbout "About Accurator"@en . -aui:headerSlogan rdfs:subPropertyOf auis:headerLabel . -aui:headerSubSlogan rdfs:subPropertyOf auis:headerLabel . -aui:buttonRegister rdfs:subPropertyOf auis:buttonLabel . -aui:buttonLogin rdfs:subPropertyOf auis:buttonLabel . -aui:linkAbout rdfs:subPropertyOf auis:linkLabel . +aui:headerSlogan rdfs:subPropertyOf auis:uiLabel . +aui:headerSubSlogan rdfs:subPropertyOf auis:uiLabel . +aui:buttonRegister rdfs:subPropertyOf auis:uiLabel . +aui:buttonLogin rdfs:subPropertyOf auis:uiLabel . +aui:linkAbout rdfs:subPropertyOf auis:uiLabel . ###### About Screen ##### @@ -59,15 +59,15 @@ aui:annotate a auis:UI ; aui:title "Tag image"@en ; aui:btnPrevious "Previous"@en ; aui:btnNext "Next"@en ; - aui:btnAnnotateRecommend "Recommended works"@en ; - aui:btnAnnotateSearch "Search"@en ; + aui:navbarBtnRecommend "Recommended works"@en ; + aui:navbarBtnSearch "Search"@en ; aui:vntFirstTitle "Your first tag!"@en ; aui:vntFirstText "Start dragging a bounding box around the object you want to describe. Multiple fields can be filled in, try to be as precise as possible. To proceed to a next object, either click on next image, get new recommendations or search for specific topics."@en . aui:btnPrevious a auis:UILabel . aui:btnNext a auis:UILabel . -aui:btnAnnotateRecommend a auis:UILabel . -aui:btnAnnotateSearch a auis:UILabel . +aui:navbarBtnRecommend a auis:UILabel . +aui:navbarBtnSearch a auis:UILabel . aui:vntFirstTitle a auis:UILabel . aui:vntFirstText a auis:UILabel . @@ -101,16 +101,16 @@ aui:profile a auis:UI ; aui:txtSubSlogan "start tagging or change your personal info"@en ; aui:txtStartAnnotating "To start tagging you can choose to search for specific works or to get works recommended."@en ; aui:txtDomain "The current domain is the "@en ; - aui:btnRecommend "Recommended works"@en ; - aui:btnSearch "Search"@en ; + aui:navbarBtnRecommend "Recommended works"@en ; + aui:navbarBtnSearch "Search"@en ; aui:btnChangeExpertise "Change expertise levels"@en ; aui:btnDomain "Change domain"@en ; aui:lblLastAnnotated "Artworks you recently tagged"@en . aui:txtStartAnnotating a auis:UILabel . aui:txtDomain a auis:UILabel . -aui:btnRecommend a auis:UILabel . -aui:btnSearch a auis:UILabel . +aui:navbarBtnRecommend a auis:UILabel . +aui:navbarBtnSearch a auis:UILabel . aui:btnChangeExpertise a auis:UILabel . aui:btnDomain a auis:UILabel . aui:btnChangeInfo a auis:UILabel . @@ -121,13 +121,13 @@ aui:lblLastAnnotated a auis:UILabel . aui:results a auis:UI ; dcterms:title "Accurator results UI"@en ; aui:title "Results"@en ; - aui:btnResultsRecommend "Recommend works"@en ; + aui:navbarBtnRecommend "Recommend works"@en ; aui:btnResultsSearch "Search"@en ; aui:txtRecTitle "Recommendations for "@en ; aui:vntFirstTitle "What do you want to tag?"@en ; aui:vntFirstText "Here you can select which works you want to tag. You can return to this screen by clicking on the recommendation button or by searching for a specific topic."@en . -aui:btnResultsRecommend a auis:UILabel . +aui:navbarBtnRecommend a auis:UILabel . aui:btnResultsSearch a auis:UILabel . aui:txtRecTitle a auis:UILabel . @@ -194,12 +194,12 @@ aui:loginIncomplete a auis:UILabel . ##### User Navbar Dropdown ##### aui:user_dropdown a auis:UI ; - aui:ddLogOut "Logout"@en ; - aui:ddAbout "About Accurator"@en ; + aui:navbarLblLogout "Logout"@en ; + aui:navbarLblAbout "About Accurator"@en ; aui:ddProfile "Profile"@en . -aui:ddLogOut a auis:UILabel . -aui:ddAbout a auis:UILabel . +aui:navbarLblLogout a auis:UILabel . +aui:navbarLblAbout a auis:UILabel . aui:ddProfile a auis:UILabel . ##### Additional Info Screen ##### diff --git a/rdf/ui/labels_nl.ttl b/rdf/ui/labels_nl.ttl index c1b4a29..0ac235e 100644 --- a/rdf/ui/labels_nl.ttl +++ b/rdf/ui/labels_nl.ttl @@ -39,8 +39,8 @@ aui:annotate a auis:UI ; aui:title "Voeg informatie toe aan object"@nl ; aui:btnPrevious "Vorige"@nl ; aui:btnNext "Volgende"@nl ; - aui:btnAnnotateRecommend "Aanbevolen werken"@nl ; - aui:btnAnnotateSearch "Zoek"@nl ; + aui:navbarBtnRecommend "Aanbevolen werken"@nl ; + aui:navbarBtnSearch "Zoek"@nl ; aui:vntFirstTitle "De eerste keer informatie toevoegen!"@nl ; aui:vntFirstText "Begin met het tekenen van een kader om informatie toe te voegen. U krijgt hierop verschillende velden om in te vullen, probeer hierbij zo precies mogelijk te zijn. Om naar een volgende afbeeldingen te gaan kunt u op volgende klikken, zoeken of nieuwe aanbevelingen bekijken."@nl . @@ -65,8 +65,8 @@ aui:profile a auis:UI ; aui:txtSubSlogan "begin met het toevoegen van informatie of verander uw instellingen"@nl ; aui:txtStartAnnotating "Om met het toevoegen van informatie te beginnen kunt u er voor kiezen specifieke werken te zoeken of te beginnen met werken die wij u aanbevelen."@nl ; aui:txtDomain "Het huidige domein is het "@nl ; - aui:btnRecommend "Aanbevolen werken"@nl ; - aui:btnSearch "Zoek"@nl ; + aui:navbarBtnRecommend "Aanbevolen werken"@nl ; + aui:navbarBtnSearch "Zoek"@nl ; aui:btnChangeExpertise "Verander expertise niveaus"@nl ; aui:btnDomain "Verander domein"@nl ; aui:lblLastAnnotated "Kunstwerken waaraan u recent informatie heeft toegevoegd"@nl . @@ -75,7 +75,7 @@ aui:profile a auis:UI ; aui:results a auis:UI ; aui:title "Zoekresultaten"@nl ; - aui:btnResultsRecommend "Aanbevolen werken"@nl ; + aui:navbarBtnRecommend "Aanbevolen werken"@nl ; aui:btnResultsSearch "Zoek"@nl ; aui:txtRecTitle "Aanbevelingen voor "@nl ; aui:vntFirstTitle "Aan welk werk wilt u informatie toevoegen?"@nl ; @@ -117,8 +117,8 @@ aui:loginModal a auis:UI ; ##### User Navbar Dropdown ##### aui:user_dropdown a auis:UI ; - aui:ddLogOut "Afmelden"@nl ; - aui:ddAbout "Over Accurator"@nl ; + aui:navbarLblLogout "Afmelden"@nl ; + aui:navbarLblAbout "Over Accurator"@nl ; aui:ddProfile "Profiel"@nl . ##### Additional Info Screen ##### diff --git a/rdf/ui/labels_schema.ttl b/rdf/ui/labels_schema.ttl index a818700..f51423f 100644 --- a/rdf/ui/labels_schema.ttl +++ b/rdf/ui/labels_schema.ttl @@ -6,7 +6,6 @@ auis:uiLabel a rdf:Property; rdfs:domain auis:UI ; - rdfs:domain xsd:Literal ; rdfs:label "Super-property of all labels"@en . auis:textLabel a rdf:Property; diff --git a/web/css/accurator.css b/web/css/accurator.css index f08a113..17e310e 100644 --- a/web/css/accurator.css +++ b/web/css/accurator.css @@ -48,8 +48,10 @@ body { height: 20px; } -/* Navbar */ -#headerImage { +/******************************************************************************* +Navbar +*******************************************************************************/ +#navbarImgLogo { height: 20px; } @@ -206,7 +208,7 @@ body { margin-top: 12px; } -#frmSearchAnnotate { +#navbarFrmSearch{ text-align: center; } diff --git a/web/html/about.html b/web/html/about.html index d5c60e5..5a6e51d 100644 --- a/web/html/about.html +++ b/web/html/about.html @@ -13,18 +13,18 @@ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> - <ul class="nav navbar-nav navbar-right userDropdown"> + <ul class="nav navbar-nav navbar-right navbarLstUser"> </ul> </div> </div> diff --git a/web/html/additional_info.html b/web/html/additional_info.html index a78855c..0703a81 100644 --- a/web/html/additional_info.html +++ b/web/html/additional_info.html @@ -13,18 +13,18 @@ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> - <ul class="nav navbar-nav navbar-right userDropdown"> + <ul class="nav navbar-nav navbar-right navbarLstUser"> </ul> </div> </div> diff --git a/web/html/domain.html b/web/html/domain.html index dcb64e9..18cee2b 100644 --- a/web/html/domain.html +++ b/web/html/domain.html @@ -13,18 +13,18 @@ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right userDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstUser"> </ul> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> </div> </div> diff --git a/web/html/end.html b/web/html/end.html index 4f0005b..4ee0801 100644 --- a/web/html/end.html +++ b/web/html/end.html @@ -13,16 +13,16 @@ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> <ul class="nav navbar-nav navbar-right"> <li><a href="about.html" id="lnkAbout"></a></li> diff --git a/web/html/expertise.html b/web/html/expertise.html index 4c88b4f..97d3ffc 100644 --- a/web/html/expertise.html +++ b/web/html/expertise.html @@ -13,18 +13,18 @@ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> - <ul class="nav navbar-nav navbar-right userDropdown"> + <ul class="nav navbar-nav navbar-right navbarLstUser"> </ul> </div> </div> diff --git a/web/html/intro.html b/web/html/intro.html index bcd6217..c765d2a 100644 --- a/web/html/intro.html +++ b/web/html/intro.html @@ -13,16 +13,16 @@ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> <ul class="nav navbar-nav navbar-right"> <li><a href="about.html" id="lnkAbout"></a></li> diff --git a/web/html/profile.html b/web/html/profile.html index a187459..0f19a1d 100644 --- a/web/html/profile.html +++ b/web/html/profile.html @@ -12,27 +12,27 @@ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> - <ul class="nav navbar-nav navbar-right userDropdown"> + <ul class="nav navbar-nav navbar-right navbarLstUser"> </ul> - <div class="navbar-form navbar-nav" id="frmGroupSearch"> + <div class="navbar-form navbar-nav" id="navbarFrmSearch"> <div class="form-group"> - <input type="text" autocomplete="off" class="form-control" id="frmSearch"> + <input type="text" autocomplete="off" class="form-control" id="navbarInpSearch"> </div> - <button id="btnSearch" class="btn btn-default"> + <button id="navbarBtnSearch" class="btn btn-default"> </button> </div> - <button class="btn navbar-btn navbar-right btn-primary" id="btnRecommend"> + <button class="btn navbar-btn navbar-right btn-primary" id="navbarBtnRecommend"> </button> </div> </div> diff --git a/web/html/results.html b/web/html/results.html index 7fd499a..9682516 100644 --- a/web/html/results.html +++ b/web/html/results.html @@ -13,27 +13,27 @@ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#accuratorCollapse"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu"> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> <a class="navbar-brand" href="intro.html"> - <img id="headerImage" src="img/accurator.png" alt="Accurator"> + <img id="navbarImgLogo" src="img/accurator.png" alt="Accurator"> </a> </div> - <div class="collapse navbar-collapse" id="accuratorCollapse"> - <ul class="nav navbar-nav navbar-right flagDropdown"> + <div class="collapse navbar-collapse" id="navbarDivMenu"> + <ul class="nav navbar-nav navbar-right navbarLstFlag"> </ul> - <ul class="nav navbar-nav navbar-right userDropdown"> + <ul class="nav navbar-nav navbar-right navbarLstUser"> </ul> - <div class="navbar-form navbar-nav" id="frmGroupSearch"> + <div class="navbar-form navbar-nav" id="navbarInpSearch"> <div class="form-group"> - <input type="text" autocomplete="off" class="form-control" id="frmSearch"> + <input type="text" autocomplete="off" class="form-control" id="navbarInpSearch"> </div> <button id="btnResultsSearch" class="btn btn-default"> </button> </div> - <button class="btn navbar-btn navbar-right btn-primary" id="btnResultsRecommend"> + <button class="btn navbar-btn navbar-right btn-primary" id="navbarBtnRecommend"> </button> </div> </div> diff --git a/web/js/accurator_annotate.js b/web/js/accurator_annotate.js index f267e58..2581e91 100644 --- a/web/js/accurator_annotate.js +++ b/web/js/accurator_annotate.js @@ -60,8 +60,8 @@ function populateUI() { function initLabels(data) { $("#btnPrevious").append(data.btnPrevious); $("#btnNext").prepend(data.btnNext); - $("#btnAnnotateRecommend").append(data.btnAnnotateRecommend); - $("#btnAnnotateSearch").append(data.btnAnnotateSearch); + $("#navbarBtnRecommend").append(data.navbarBtnRecommend); + $("#navbarBtnSearch").append(data.navbarBtnSearch); vntFirstTitle = data.vntFirstTitle; vntFirstText = data.vntFirstText; // Add next to optional experiment navigation @@ -87,18 +87,18 @@ function addPath() { } function addButtonEvents() { - $("#btnAnnotateRecommend").click(function() { + $("#navbarBtnRecommend").click(function() { document.location.href="results.html" + "?user=" + user; }); // Search on pressing enter - $("#frmSearch").keypress(function(event) { + $("#navbarInpSearch").keypress(function(event) { if (event.which == 13) { - var query = encodeURIComponent($("#frmSearch").val()); + var query = encodeURIComponent($("#navbarInpSearch").val()); document.location.href="results.html?query=" + query; } }); - $("#btnAnnotateSearch").click(function() { - var query = encodeURIComponent($("#frmSearch").val()); + $("#navbarBtnSearch").click(function() { + var query = encodeURIComponent($("#navbarInpSearch").val()); document.location.href="results.html?query=" + query; }); } diff --git a/web/js/accurator_profile.js b/web/js/accurator_profile.js index 2bc1cdc..300f14f 100644 --- a/web/js/accurator_profile.js +++ b/web/js/accurator_profile.js @@ -75,9 +75,9 @@ function initLabels(labels) { } $("#txtSubSlogan").prepend(labels.txtSubSlogan); $("#txtStartAnnotating").append(labels.txtStartAnnotating); - $("#btnRecommend").append(labels.btnRecommend); + $("#navbarBtnRecommend").append(labels.navbarBtnRecommend); $("#btnChangeExpertise").append(labels.btnChangeExpertise); - $("#btnSearch").append(labels.btnSearch); + $("#navbarBtnSearch").append(labels.navbarBtnSearch); $("#btnDomain").prepend(labels.btnDomain); $("#lblLastAnnotated").append(labels.lblLastAnnotated); } @@ -146,18 +146,18 @@ function addDomainEvent(domain) { } function addButtonEvents() { - $("#btnRecommend").click(function() { + $("#navbarBtnRecommend").click(function() { document.location.href="results.html" + "?user=" + user; }); // Search on pressing enter - $("#frmSearch").keypress(function(event) { + $("#navbarInpSearch").keypress(function(event) { if (event.which == 13) { - var query = encodeURIComponent($("#frmSearch").val()); + var query = encodeURIComponent($("#navbarInpSearch").val()); document.location.href="results.html?query=" + query; } }); - $("#btnSearch").click(function() { - var query = encodeURIComponent($("#frmSearch").val()); + $("#navbarBtnSearch").click(function() { + var query = encodeURIComponent($("#navbarInpSearch").val()); document.location.href="results.html?query=" + query; }); $("#btnChangeExpertise").click(function() { diff --git a/web/js/accurator_results.js b/web/js/accurator_results.js index 85f962d..302baa7 100644 --- a/web/js/accurator_results.js +++ b/web/js/accurator_results.js @@ -67,25 +67,25 @@ function initLabels(labels) { document.title = labels.title; $("#btnResultsSearch").append(labels.btnResultsSearch); - $("#btnResultsRecommend").append(labels.btnResultsRecommend); + $("#navbarBtnRecommend").append(labels.navbarBtnRecommend); txtRecTitle = labels.txtRecTitle; vntFirstTitle = labels.vntFirstTitle; vntFirstText = labels.vntFirstText; } function addButtonEvents() { - $("#btnResultsRecommend").click(function() { + $("#navbarBtnRecommend").click(function() { document.location.href="results.html" + "?user=" + user; }); // Search on pressing enter - $("#frmSearch").keypress(function(event) { + $("#navbarInpSearch").keypress(function(event) { if (event.which == 13) { - var query = encodeURIComponent($("#frmSearch").val()); + var query = encodeURIComponent($("#navbarInpSearch").val()); document.location.href="results.html?query=" + query; } }); $("#btnResultsSearch").click(function() { - var query = encodeURIComponent($("#frmSearch").val()); + var query = encodeURIComponent($("#navbarInpSearch").val()); document.location.href="results.html?query=" + query; }); } diff --git a/web/js/accurator_utilities.js b/web/js/accurator_utilities.js index 6879d7d..f2113c6 100644 --- a/web/js/accurator_utilities.js +++ b/web/js/accurator_utilities.js @@ -164,17 +164,17 @@ function setLocale(languageCode, onSuccess) { function populateFlags(locale) { // Code to add flags to navbar allowing to change the locale - $(".flagDropdown").append( + $(".navbarLstFlag").append( $.el.li({'class':'dropdown'}, getInitialFlag(locale), $.el.ul({'class':'dropdown-menu', 'role':'menu'}, $.el.li($.el.a({'href':'#', - 'id':'flagEn'}, + 'id':'navbarLnkEn'}, $.el.span({'class':'flag-icon flag-icon-en'}), " English")), $.el.li($.el.a({'href':'#', - 'id':'flagNl'}, + 'id':'navbarLnkNl'}, $.el.span({'class':'flag-icon flag-icon-nl'}), " Nederlands")) ) @@ -187,10 +187,10 @@ function populateFlags(locale) { function flagEvents() { var onSuccess = function(){location.reload();}; - $("#flagEn").click(function() { + $("#navbarLnkEn").click(function() { setLocale("en", onSuccess); }); - $("#flagNl").click(function() { + $("#navbarLnkNl").click(function() { setLocale("nl", onSuccess); }); } @@ -285,26 +285,24 @@ function alertMessage(title, text, type) { function populateNavbar(userName, linkList) { // Only popluate navbar when no experiment is running if(typeof experiment === "undefined" || experiment === "none") { - populateUserDropdown(userName, linkList); + populateNavbarUser(userName, linkList); } else { // Hide recommendations button if experiment is running - $("#btnRecommend").hide(); - $("#btnAnnotateRecommend").hide(); - $("#btnResultsRecommend").hide(); + $("#navbarBtnRecommend").hide(); // Hide search form - $("#frmGroupSearch").hide(); + $("#navbarFrmSearch").hide(); // Remove link from logo if experiment is running $(".navbar-brand").attr('href', "#"); } } -function populateUserDropdown(userName, linkList) { +function populateNavbarUser(userName, linkList) { // Add a user drop down based on the user and listed links $.getJSON("ui_elements", {locale:locale, ui:"http://accurator.nl/ui/generic#user_dropdown", type:"labels"}) .done(function(data){ - $(".userDropdown").append( + $(".navbarLstUser").append( $.el.li({'class':'dropdown'}, $.el.a({'href':'#', 'class':'dropdown-toggle', @@ -316,16 +314,16 @@ function populateUserDropdown(userName, linkList) { $.el.ul({'class':'dropdown-menu', 'role':'menu'}, $.el.li($.el.a({'href':'#', - 'id':'btnLogout'}, - data.ddLogOut)), + 'id':'navbarLnkLogout'}, + data.navbarLblLogout)), // Add links based on array addLinks(linkList, data), $.el.li({'class':'divider'}), $.el.li($.el.a({'href':'about.html'}, - data.ddAbout)))) + data.navbarLblAbout)))) ) // Add logout event to menu item - $("#btnLogout").click(function() { + $("#navbarLnkLogout").click(function() { logout(); }); });