Merge branch 'master' of https://github.com/ilios/ilios

ctam · ctam · commit a431ff2cc325 · 2014-02-20T15:02:06.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ install:
 
 before_script:
 # Set up Sauce Connect if we have a Sauce username set
-  - if [ "$SAUCE_USERNAME" ] ; then (curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash); fi
+  - if [ "$SAUCE_USERNAME" ] ; then (curl -L https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash); fi
 
 # Provision web server for Behat tests
   - "sudo apt-get install -y --force-yes mysql-server apache2 libapache2-mod-php5 php5-mysql php5-ldap sendmail expect > /dev/null"
diff --git a/web/application/controllers/curriculum_inventory_manager.php b/web/application/controllers/curriculum_inventory_manager.php
@@ -69,7 +69,6 @@ public function __construct ()
     public function index ()
     {
         $data = array();
-        $data['institution_name'] = $this->config->item('ilios_institution_name');
         $data['user_id'] = $this->session->userdata('uid');
 
         // authorization check
@@ -148,7 +147,6 @@ public function create ()
         $rhett = array();
 
         $data = array();
-        $data['institution_name'] = $this->config->item('ilios_institution_name');
         $data['user_id'] = $this->session->userdata('uid');
 
         // authorization check
@@ -292,7 +290,6 @@ public function update ()
     public function export ()
     {
         $data = array();
-        $data['institution_name'] = $this->config->item('ilios_institution_name');
         $data['user_id'] = $this->session->userdata('uid');
 
         // authorization check
@@ -398,7 +395,6 @@ public function delete ()
     public function download ()
     {
         $data = array();
-        $data['institution_name'] = $this->config->item('ilios_institution_name');
         $data['user_id'] = $this->session->userdata('uid');
 
         // authorization check
diff --git a/web/application/language/ilios_strings_en_US.properties b/web/application/language/ilios_strings_en_US.properties
@@ -63,6 +63,8 @@ general.phrases.add_user=Add User
 general.phrases.advanced_search=Advanced Search
 general.phrases.associated_courses=Associated Courses
 general.phrases.associated_learners=Associated Student Groups
+general.phrases.available_cohorts=Available Cohorts
+general.phrases.available_items=Available items
 general.phrases.choose_date=Choose a date
 general.phrases.class_title_prefix=Class of
 general.phrases.clear_dates=Clear Dates
@@ -147,6 +149,7 @@ general.phrases.select_cohort=Select Cohort
 general.phrases.select_items=Please select items
 general.phrases.select_one=Please select one
 general.phrases.select_school=Select School to View
+general.phrases.selected_cohorts=Selected Cohorts
 general.phrases.selected_items=Selected items
 general.phrases.show_course_summary=Show Course Summary
 general.phrases.show_less=Show Less
diff --git a/web/application/language/ilios_strings_xx.properties b/web/application/language/ilios_strings_xx.properties
@@ -63,6 +63,8 @@ general.phrases.add_user=X$X$X$X$
 general.phrases.advanced_search=X$X$X$X$
 general.phrases.associated_courses=X$X$X$X$
 general.phrases.associated_learners=X$X$X$X$
+general.phrases.available_cohorts=X$X$X$X$
+general.phrases.available_items=X$X$X$X$
 general.phrases.choose_date=X$X$X$X$
 general.phrases.class_title_prefix=X$X$X$X$
 general.phrases.clear_dates=X$X$X$X$
@@ -147,6 +149,7 @@ general.phrases.select_cohort=X$X$X$X$
 general.phrases.select_items=X$X$X$X$
 general.phrases.select_one=X$X$X$X$
 general.phrases.select_school=X$X$X$X$
+general.phrases.selected_cohorts=X$X$X$X$
 general.phrases.selected_items=X$X$X$X$
 general.phrases.show_course_summary=X$X$X$X$
 general.phrases.show_less=X$X$X$X$
diff --git a/web/application/views/course/course_manager.php b/web/application/views/course/course_manager.php
@@ -160,7 +160,6 @@
             window.inform = ilios.alert.inform;
         });
 
-        var tmpStr = '<?php echo $institution_name; ?> ' + ilios_i18nVendor.getI18NString('general.terms.programs');
         var sessionTypeModel = null;
 
 <?php
@@ -177,10 +176,11 @@
             hide_autocomplete_input : 'value matters not',
             submit_override : ilios.cm.handleProgramCohortDialogSubmit,
             widget_dom_generator : ilios.ui.programCohortDialogTreeDOMGenerator,
-            tab_title : ilios_i18nVendor.getI18NString('general.phrases.select_cohort'),
+            tab_title : ilios_i18nVendor.getI18NString('general.phrases.available_cohorts'),
             id_uniquer : 'scde_',
-            panel_title_text : tmpStr,
             dom_root : 'cohort_pick_dialog',
+            title: ilios_i18nVendor.getI18NString('course_management.select_cohorts'),
+            selected_items_title: ilios_i18nVendor.getI18NString('general.phrases.selected_cohorts'),
             deselect_handler : ilios.cm.handleProgramCohortDialogDeselection,
             max_displayed_results: 250,
             panel_width: '700px'
diff --git a/web/application/views/group/group_manager.php b/web/application/views/group/group_manager.php
@@ -100,12 +100,6 @@
             window.inform = ilios.alert.inform;
         });
 
-        var tmpStr = '<?php echo $institution_name; ?> '
-            + ilios_i18nVendor.getI18NString('general.terms.programs')
-            + ' - '
-            + ilios_i18nVendor.getI18NString('general.phrases.school_of')
-            + ' <?php echo $school_name; ?>';
-
         ilios.preferences.installPreferencesModel();
 
         YAHOO.util.Event.onDOMReady(ilios.dom.generateGenericDialogMarkupAndWireContent, {
@@ -130,9 +124,9 @@
             trigger : 'find_cohort_and_program',
             display_handler : ilios.ui.handleProgramCohortSelectionDialogDisplay,
             widget_dom_generator : ilios.ui.programCohortDialogTreeDOMGenerator,
-            tab_title : ilios_i18nVendor.getI18NString('general.phrases.select_cohort'),
+            tab_title : ilios_i18nVendor.getI18NString('general.phrases.available_cohorts'),
             id_uniquer : 'dme_',
-            panel_title_text : tmpStr,
+            title: ilios_i18nVendor.getI18NString('groups.select_program'),
             dom_root : 'cohort_pick_dialog'
         });
 
diff --git a/web/application/views/scripts/ilios_dom.js b/web/application/views/scripts/ilios_dom.js
@@ -329,10 +329,10 @@ ilios.dom.generateAutoCompleteDialogMarkup = function (args) {
  *                                          whose id is provided; the elements represent the UI
  *                                          single-selection widget
  *          hide_autocomplete_input:    if non-null, then the autocomplete input will be hidden
- *          tab_title:                  the title for the tab containing the selection widget;
- *          panel_title_text:           the header title text for the panel (not to be
- *                                          confused with the title bar text which will
- *                                          be "Please select items")
+ *          tab_title:                  the title for the tab containing the selection widget (optional, defaults to "Available items")
+ *          selected_items_title:       the title for the selected items list (optional, defaults to "Selected items")
+ *          title:                      the widget title (optional, defaults to "Please select items")
+ *          panel_title_text:           the header title text for the panel (optional, not displayed when not given)
  *          dom_root:                   the id of the DOM element into which this markup should
  *                                          be inserted
  *          panel_width:                if this is non-null, it is expected to a valid CSS
@@ -374,17 +374,20 @@ ilios.dom.generateGenericDialogMarkupAndWireContent = function (use, less, args)
     var autoCompleteTextFieldId = args['id_uniquer'] + '_auto_comp_input';
     var selectedItemListElement = args['id_uniquer'] + '_selected_item_list';
     var autoCompleter = null;
-    var aStr = ilios_i18nVendor.getI18NString('general.phrases.select_items');
+    var aStr = args['title'] || ilios_i18nVendor.getI18NString('general.phrases.select_items');
     var noAutoCompleter = (args['remote_data'] == null);
     var showAutoCompleteInput = (args['hide_autocomplete_input'] == null);
+    var panelTitle = args['panel_title_text'] || '';
 
     contents += '<div class="visuallyhidden" id="' + autoCompleteHiddenContainerId + '"></div>\n';
 
     contents += '<div class="hd">' + aStr + '</div>\n';
     contents += '<div class="bd">\n';
     contents += '<div class="dialog_wrap">';
 
-    contents += '<p>' + args['panel_title_text'] + '</p>';
+    if (panelTitle) {
+        contents += '<p>' + panelTitle + '</p>';
+    }
 
     if (args['indeterminate_loading_id'] != null) {
         contents += '<div id="' + args['indeterminate_loading_id']
@@ -396,7 +399,7 @@ ilios.dom.generateGenericDialogMarkupAndWireContent = function (use, less, args)
 
     contents += '<div class="dialog_left">';
 
-    aStr = ilios_i18nVendor.getI18NString('general.phrases.selected_items');
+    aStr = args['selected_items_title'] || ilios_i18nVendor.getI18NString('general.phrases.selected_items');
     contents += '<label class="picked_label" for="' + selectedItemListElement + '">';
     contents += aStr;
     contents += '</label>';
@@ -966,9 +969,8 @@ ilios.dom.generateTreeSelectionDialogMarkupAndWireContent = function (use, less,
  *                                          whose id is provided; the elements represent the UI
  *                                          single-selection widget
  *          tab_title:                  the title for the tab containing the selection widget
- *          panel_title_text:           the header title text for the panel (not to be
- *                                          confused with the title bar text which will
- *                                          be "Please select items")
+ *          title:                      the widget title (optional, defaults to "Please select items")
+ *          panel_title_text:           the header title text for the panel (optional, not displayed when not given)
  *          dom_root:                   the id of the DOM element into which this markup should
  *                                          be inserted
  *          panel_width:                if this is non-null, it is expected to a valid CSS
@@ -993,13 +995,15 @@ ilios.dom.generateSelectAndCloseDialogMarkupAndWireContent = function (use, less
     var panelWidth = (args['panel_width'] != null) ? args['panel_width'] : "600px";
     var dialog = null;
     var displayOnTriggerHandler = null;
-    var i18nStr = ilios_i18nVendor.getI18NString('general.phrases.select_items');
+    var i18nStr = args['title'] || ilios_i18nVendor.getI18NString('general.phrases.select_items');
+    var panelTitleText = args['panel_title_text'] || '';
 
     contents += '<div class="hd">' + i18nStr + '</div>\n';
     contents += '<div class="bd">\n';
 
-    contents += '<p>' + args['panel_title_text'] + '</p>';
-
+    if (panelTitleText) {
+        contents += '<p>' + panelTitleText + '</p>';
+    }
 
     // YUI -- IF THERE'S NO FORM INSIDE A DIALOG DOM, IT REVEALS A YUI BUG
     contents += '<form method="POST" action="matters not at all">\n';
