Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as =================================================================== diff -u -rc086a9913cea155e2ac9ed14df0e43b04182232d -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as (.../IndexButton.as) (revision c086a9913cea155e2ac9ed14df0e43b04182232d) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as (.../IndexButton.as) (revision 5ddfdbac1683d4bf2ecc02de76199e1287cc65e1) @@ -88,7 +88,7 @@ Debugger.log(">> clicked", Debugger.GEN, "indexClicked", "IndexButton"); mm.drawIndexButtons = false; mm.updateIndexButtons(">>"); - } else if (buttonText == "Go") { + } else if (buttonText == Dictionary.getValue('mv_search_go_btn_lbl')) { // 'Go' button mm.learnerIndexView.textFieldContents = String(mm.learnerIndexView.getIdxTextField().text); // backup the string incase need to remove textfield if(!isNaN(mm.learnerIndexView.getIdxTextField().text)) { // if the text field contains a number var idx:Number = Number(mm.learnerIndexView.getIdxTextField().text); @@ -99,10 +99,10 @@ mm.oldIndex = mm.currentLearnerIndex; } else - LFMessage.showMessageAlert("The page number must be between 1 and "+ mm.numIndexButtons, null); + LFMessage.showMessageAlert(Dictionary.getValue('mv_search_invalid_input_msg', [mm.numIndexButtons]), null); } else if (mm.learnerIndexView.getIdxTextField().text == "") { - LFMessage.showMessageAlert("Please enter a search query or page number between 1 and "+ mm.numIndexButtons, null); + LFMessage.showMessageAlert(Dictionary.getValue('mv_search_error_msg', [mm.numIndexButtons]), null); } else { var mc:MonitorController = mm.getMonitor().getMV().getController(); @@ -111,14 +111,14 @@ mm.drawIndexButtons = true; mm.currentLearnerIndexNoRedraw = 1; mm.searchResults = matchesArr; - var toggleBtn:MovieClip = mm.getMonitor().getMV().getLearnerIndexPanel().toggleBtn; - toggleBtn._visible = true; + var indexViewBtn:MovieClip = mm.getMonitor().getMV().getLearnerIndexPanel().indexViewBtn; + indexViewBtn._visible = true; } else { - LFMessage.showMessageAlert(mm.learnerIndexView.getIdxTextField().text + " was not found.", null); + LFMessage.showMessageAlert(Dictionary.getValue('mv_search_not_found_msg', [mm.learnerIndexView.getIdxTextField().text]), null); } } } - else if (buttonText == "Index View") { + else if (buttonText == Dictionary.getValue('mv_search_index_view_btn_lbl')) { // the 'Index View' button mm.drawIndexButtons = true; mm.inSearchView = false; mm.resetSearchTextField = true; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -rc086a9913cea155e2ac9ed14df0e43b04182232d -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision c086a9913cea155e2ac9ed14df0e43b04182232d) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 5ddfdbac1683d4bf2ecc02de76199e1287cc65e1) @@ -161,7 +161,8 @@ _currentLearnerIndex = 1; _oldIndex = 1; _numPreferredIndexButtons = 10; // to be displayed at a time - _learnersPerPage = (_root.pb == undefined) ? 10 : _root.pb; + //_learnersPerPage = (_root.pb == undefined) ? 10 : _root.pb; + _learnersPerPage = 2; _firstDisplayedIndexButton = 1; _oldFirstDisplayedIndexButton = 1; Debugger.log("progress batch number: "+_root.pb,Debugger.CRITICAL,"MonitorModel","MonitorModel"); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as =================================================================== diff -u -rc086a9913cea155e2ac9ed14df0e43b04182232d -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as (.../LearnerIndexView.as) (revision c086a9913cea155e2ac9ed14df0e43b04182232d) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as (.../LearnerIndexView.as) (revision 5ddfdbac1683d4bf2ecc02de76199e1287cc65e1) @@ -71,7 +71,7 @@ private var backBtn:MovieClip; private var nextBtn:MovieClip; private var goBtn:MovieClip; - private var toggleBtn:MovieClip; + private var indexViewBtn:MovieClip; private var textFieldBackground_mc:MovieClip; private var labelBackground_mc:MovieClip; private var idxTextField:TextField; @@ -97,7 +97,7 @@ btnWidth = 45; buttonsShown = false; navigationButtonsDrawn = false; - defaultString = "Enter search query or page no."; + defaultString = Dictionary.getValue("mv_search_default_txt"); this._visible = false; displayedButtons = new Array(); @@ -161,7 +161,6 @@ case 'DRAW_BUTTONS' : // this event is only fired when << or >> buttons clicked as it doesn't redraw learnertabview contents if (infoObj.tabID == _tabID && !mm.locked && mm.numIndexButtons>1) { if (!buttonsShown || (mm.numIndexButtons > displayedButtons.length)) { - //drawButtons = false; setupButtons(mm); // this only renames the index buttons as drawbuttons equals false this._visible = true; } @@ -189,14 +188,11 @@ } public function setupButtons(mm:MonitorModel):Void { - - rangeLabel.text = "Page " + mm.currentLearnerIndex + " of " + mm.numIndexButtons; + rangeLabel.text = Dictionary.getValue('mv_search_current_page_lbl', [mm.currentLearnerIndex, mm.numIndexButtons]); Debugger.log("displayedButtons.length: "+displayedButtons.length, Debugger.CRITICAL, "setupButtons", "LearnerIndexView"); if (!navigationButtonsDrawn && mm.numIndexButtons > displayedButtons.length && displayedButtons.length == mm.numPreferredIndexButtons) mm.drawIndexButtons = true; - var dib = mm.drawIndexButtons; // false on refresh should be true - Debugger.log("setupButtons dib: "+dib, Debugger.CRITICAL, "setupButtons", "LearnerIndexView"); if ((displayedButtons.length > 0) && (mm.drawIndexButtons)) { removeButtons(); } @@ -207,7 +203,7 @@ addIndexTextField(mm); addGoButton(mm); if (mm.inSearchView) { - addToggleViewButton(mm); + addIndexViewButton(mm); } } @@ -235,7 +231,6 @@ public function removeButtons(){ Debugger.log("Removing Index Buttons", Debugger.GEN, "removeButtons", "LearnerIndexView"); - //labelBackground_mc.removeMovieClip(rangeLabel); _buttonsPanel_mc.removeMovieClip(rangeLabel); if (mm.numIndexButtons > mm.numPreferredIndexButtons) @@ -256,7 +251,7 @@ _buttonsPanel_mc.removeMovieClip(textFieldBackground_mc); _buttonsPanel_mc.removeMovieClip(goBtn); - _buttonsPanel_mc.removeMovieClip(toggleBtn); + _buttonsPanel_mc.removeMovieClip(indexViewBtn); } private function addRangeLabel(mm:MonitorModel):Void { @@ -266,7 +261,7 @@ rangeLabel._x = 0; rangeLabel._width = 90; rangeLabel.autoSize = "center" - rangeLabel.text = "Page " + mm.currentLearnerIndex + " of " + mm.numIndexButtons; + rangeLabel.text = Dictionary.getValue('mv_search_current_page_lbl', [mm.currentLearnerIndex, mm.numIndexButtons]); nextPosition += rangeLabel._width; } @@ -286,14 +281,11 @@ Debugger.log("mm.lastDisplayedIndexButton: "+mm.lastDisplayedIndexButton, Debugger.GEN, "addIndexButton", "LearnerIndexView"); var count:Number = 0; - Debugger.log("displayedButtons[displayedButtons.length-1].label.text: "+displayedButtons[displayedButtons.length-1].label.text, Debugger.GEN, "addIndexButton", "LearnerIndexView"); - if (mm.inSearchView && (mm.firstDisplayedIndexButton == mm.lastDisplayedIndexButton)) { // do nothing // won't draw numbered index buttons if in search view and there's only one page of results } else { - Debugger.log("this should be false mm.drawIndexButtons: "+mm.drawIndexButtons, Debugger.GEN, "addIndexButton", "LearnerIndexView"); for (var i=mm.firstDisplayedIndexButton; i<=mm.lastDisplayedIndexButton; i++) { if (mm.drawIndexButtons) { var idxBtn:MovieClip = _buttonsPanel_mc.attachMovie("IndexButton", "idxBtn"+i, _buttonsPanel_mc.getNextHighestDepth(), {_width: btnWidth, _labelText: String(i)}); @@ -326,9 +318,9 @@ _buttonsPanel_mc.attachMovie("textFieldBackground", "textFieldBackground_mc", _buttonsPanel_mc.getNextHighestDepth(), {_x: nextPosition, _y: 0}); var textFieldBackground = _buttonsPanel_mc["textFieldBackground_mc"]; - textFieldBackground._width = 150; + textFieldBackground._width = 175; - textFieldBackground.createTextField("idxTextField", textFieldBackground.getNextHighestDepth(), 0, 0, 150, 20); + textFieldBackground.createTextField("idxTextField", textFieldBackground.getNextHighestDepth(), 0, 0, 175, 20); idxTextField = textFieldBackground["idxTextField"]; idxTextField._visible = true; @@ -352,18 +344,18 @@ } private function addGoButton(mm:MonitorModel):Void { - goBtn = _buttonsPanel_mc.attachMovie("IndexButton", "goBtn", _buttonsPanel_mc.getNextHighestDepth(), {_width: btnWidth, _labelText: "Go"}); + goBtn = _buttonsPanel_mc.attachMovie("IndexButton", "goBtn", _buttonsPanel_mc.getNextHighestDepth(), {_width: btnWidth, _labelText: Dictionary.getValue('mv_search_go_btn_lbl')}); _indexButton = IndexButton(goBtn); _indexButton.init(mm, undefined); goBtn._x = nextPosition; nextPosition += (btnWidth); } - private function addToggleViewButton(mm:MonitorModel):Void { - toggleBtn = _buttonsPanel_mc.attachMovie("IndexButton", "toggleBtn", _buttonsPanel_mc.getNextHighestDepth(), {_width: (btnWidth * 2), _labelText: "Index View"}); - _indexButton = IndexButton(toggleBtn); + private function addIndexViewButton(mm:MonitorModel):Void { + indexViewBtn = _buttonsPanel_mc.attachMovie("IndexButton", "indexViewBtn", _buttonsPanel_mc.getNextHighestDepth(), {_width: (btnWidth * 2), _labelText: Dictionary.getValue('mv_search_index_view_btn_lbl')}); + _indexButton = IndexButton(indexViewBtn); _indexButton.init(mm, undefined); - toggleBtn._x = nextPosition; + indexViewBtn._x = nextPosition; nextPosition += (btnWidth * 2); } @@ -400,7 +392,7 @@ return idxTextField; } - public function getToggleBtn():MovieClip { - return toggleBtn; + public function getIndexViewBtn():MovieClip { + return indexViewBtn; } } \ No newline at end of file Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -rc086a9913cea155e2ac9ed14df0e43b04182232d -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -rc086a9913cea155e2ac9ed14df0e43b04182232d -r5ddfdbac1683d4bf2ecc02de76199e1287cc65e1 Binary files differ