diff --git a/app/models/answer.rb b/app/models/answer.rb index d9c68ac..a2a625f 100644 --- a/app/models/answer.rb +++ b/app/models/answer.rb @@ -97,7 +97,7 @@ # 'standards' is a list of : pairs # 'text' is the text from the comments box def answer_hash - default = {'standards' => {}, text => ''} + default = {'standards' => {}, 'text' => ''} begin h = self.text.nil? ? default : JSON.parse(self.text) rescue JSON::ParserError => e @@ -115,8 +115,8 @@ # nothing returned, but the status of the text field of the answer is changed def update_answer_hash(standards={},text="") h = {} - h[:standards] = standards - h[:text] = text + h['standards'] = standards + h['text'] = text self.text = h.to_json end end diff --git a/app/views/answers/_new_edit.html.erb b/app/views/answers/_new_edit.html.erb index 0e74706..303af23 100644 --- a/app/views/answers/_new_edit.html.erb +++ b/app/views/answers/_new_edit.html.erb @@ -10,27 +10,31 @@ <% if q_format.rda_metadata? %> <% answer_hash = answer.answer_hash %> <div class="rda_metadata"><button class="remove-standard" style="display:hidden"></button> - <div class="selected_standards">Your Selected Standards:</br><ul class="list bullet"></ul></div> + <div class="selected_standards"><strong><%=_("Your Selected Standards:")%></strong></br><ul class="list bullet"></ul></div> <div class="rda_right" style="float:right;width:50%;margin-bottom:5px;"> OR Search:</br> <input type="text" data-provide="typeahead" class="standards-typeahead"></input></br> - <button class="btn btn-primary select_standard_typeahead">Add Standard</button> + <button class="btn btn-primary select_standard_typeahead"><%=_("Add Standard")%></button> </div> - <div class="subject">Please select a subject</br><select name="subject"></select></div> - <div class="sub-subject">Please select a sub-subject</br><select name="sub-subject"></select></div> + <div class="subject"><%=_("Please select a subject")%></br> + <select name="subject" class="form-control"></select> + </div> + <div class="sub-subject"><%=_("Please select a sub-subject")%></br> + <select name="sub-subject" class="form-control"></select> + </div> </br> <div class="suggested-answer-div"> <span class="suggested-answer-intro"> - <%=_("Browse Standards") %> + <strong><%=_("Browse Standards") %></strong> </span> <div class="browse-standards-border"> <p class="suggested-answer"> - <%=_("Please wait, Standards are loading")%> + <strong><%=_("Please wait, Standards are loading")%></strong> </p> </div> <div> - <a href="#" class="custom-standard">Standard not listed? Add your own.</a> + <a href="#" class="custom-standard"><strong>Standard not listed? Add your own.</strong></a> <div class="add-custom-standard" style="display:none;"> <input type="text" class="custom-standard-name"></input> <button class="btn btn-primary submit_custom_standard">Add Standard</button> diff --git a/app/views/questions/_new_edit_question_option_based.html.erb b/app/views/questions/_new_edit_question_option_based.html.erb index 0304b76..171bf4d 100644 --- a/app/views/questions/_new_edit_question_option_based.html.erb +++ b/app/views/questions/_new_edit_question_option_based.html.erb @@ -38,7 +38,7 @@ <% end %> <div class="form-group"> <% if question.option_comment_display %><!-- Comment text area for option_based questions --> - <% text = question.question_format.rda_metadata? ? answer.answer_hash[:text] : answer.text %> + <% text = question.question_format.rda_metadata? ? answer.answer_hash['text'] : answer.text %> <%= label_tag('answer[text]', _('Additional Information'), class: 'control-label') %> <%= text_area_tag('answer[text]', text, id: "answer-text-#{question.id}", class: "form-control tinymce_answer") %> <% end %> diff --git a/lib/assets/javascripts/views/answers/rda_metadata.js b/lib/assets/javascripts/views/answers/rda_metadata.js index 0dfedaf..f0f6a71 100644 --- a/lib/assets/javascripts/views/answers/rda_metadata.js +++ b/lib/assets/javascripts/views/answers/rda_metadata.js @@ -127,7 +127,6 @@ // form listing of standards const formStandards = $(this).next('form').find('#standards'); // need to pull in the value from frm_stds - console.log(formStandards.val()); const standardsArray = JSON.parse(formStandards.val()); // init the data value formStandards.data('standard', standardsArray); diff --git a/lib/assets/stylesheets/overrides.scss b/lib/assets/stylesheets/overrides.scss index cce87cb..2d254f5 100644 --- a/lib/assets/stylesheets/overrides.scss +++ b/lib/assets/stylesheets/overrides.scss @@ -164,19 +164,19 @@ margin-right: 25px; } -/* Overrides ul list */ +/* Overrides ul list */ #modal-permissions ul { list-style-type: none; } -/* Overrides list-group */ +/* Overrides list-group */ #modal-permissions .list-group li:nth-child(1){ border-top: 0 none; } -/* Overrides list-group-item */ +/* Overrides list-group-item */ #modal-permissions .list-group-item { - height: 30px; + height: 30px; padding: 5px 15px; } @@ -383,7 +383,7 @@ .tooltip-inner { min-width: 320px; - max-width: 100%; + max-width: 100%; text-align: left; } @@ -493,3 +493,20 @@ .input-group-addon { border-radius: 0px; } + +/* rda styling */ +.browse-standards-border { + border: 1px solid $grey; + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; + padding: 10px 10px 5px 10px; + margin-bottom:10px; + overflow-y: scroll; + max-height: 300px; + width: 100%; +} + +.rda_metadata .form-control { + width: auto; +}