Skip to content

Commit

Permalink
Merge pull request sakaiproject#2654 from clhedrick/LSNBLDR-641a
Browse files Browse the repository at this point in the history 
LSNBLDR-641; put titles on toolbar for item
  • Loading branch information
@clhedrick
clhedrick committed May 25, 2016
2 parents 3235e7f + 09c0153 commit 6b099ba
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions ...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,7 @@ public int compare(SimpleStudentPage o1, SimpleStudentPage o2) {
boolean entityDeleted = false;
boolean notPublished = false;
if (canEditPage) {
UIOutput.make(tableRow, "edit-td");
UIOutput.make(tableRow, "edit-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.generic").replace("{}", i.getName())));
UILink.make(tableRow, "edit-link", (String)null, "").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.generic").replace("{}", i.getName())));

// the following information is displayed using <INPUT
Expand Down Expand Up @@ -1781,7 +1781,7 @@ else if (lessonEntity.notPublished())
UIOutput.make(tableRow, "current-item-id4", Long.toString(i.getId()));
UIOutput.make(tableRow, "item-prereq3", String.valueOf(i.isPrerequisite()));
UIVerbatim.make(tableRow, "item-path3", getItemPath(i));
UIOutput.make(tableRow, "editimage-td");
UIOutput.make(tableRow, "editimage-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.url").replace("{}", abbrevUrl(i.getURL()))));
UILink.make(tableRow, "image-edit", (String)null, "").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.url").replace("{}", abbrevUrl(i.getURL()))));
}

Expand Down Expand Up @@ -1836,7 +1836,7 @@ else if (lessonEntity.notPublished())
UIOutput.make(tableRow, "current-item-id5", Long.toString(i.getId()));
UIOutput.make(tableRow, "item-prereq4", String.valueOf(i.isPrerequisite()));
UIVerbatim.make(tableRow, "item-path4", getItemPath(i));
UIOutput.make(tableRow, "youtube-td");
UIOutput.make(tableRow, "youtube-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.youtube")));
UILink.make(tableRow, "youtube-edit", (String)null, "").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.youtube")));
}

Expand Down Expand Up @@ -2058,7 +2058,7 @@ else if (lessonEntity.notPublished())
UIOutput.make(tableRow, "prerequisite", (i.isPrerequisite()) ? "true" : "false");
UIOutput.make(tableRow, "current-item-id6", Long.toString(i.getId()));
UIVerbatim.make(tableRow, "item-path5", getItemPath(i));
UIOutput.make(tableRow, "movie-td");
UIOutput.make(tableRow, "movie-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.url").replace("{}", abbrevUrl(i.getURL()))));
UILink.make(tableRow, "edit-movie", (String)null, "").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.url").replace("{}", abbrevUrl(i.getURL()))));
}

Expand Down Expand Up @@ -2127,7 +2127,7 @@ else if (lessonEntity.notPublished())
UIOutput.make(tableRow, "embedtype", mmDisplayType);
UIOutput.make(tableRow, "current-item-id3", Long.toString(i.getId()));
UIVerbatim.make(tableRow, "item-path2", getItemPath(i));
UIOutput.make(tableRow, "editmm-td");
UIOutput.make(tableRow, "editmm-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.url").replace("{}", abbrevUrl(i.getURL()))));
UILink.make(tableRow, "iframe-edit", (String)null, "").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.url").replace("{}", abbrevUrl(i.getURL()))));
}

Expand Down Expand Up @@ -2201,7 +2201,7 @@ else if (lessonEntity.notPublished())
.decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.show-grading-pane-comments")));
}

UIOutput.make(tableRow, "comments-td");
UIOutput.make(tableRow, "comments-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.comments")));

if (i.getSequence() > 0) {
UILink.make(tableRow, "edit-comments", (String)null, "")
Expand Down Expand Up @@ -2624,7 +2624,7 @@ public int compare(SimpleStudentPage o1, SimpleStudentPage o2) {
.decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.show-grading-pane-content")));
}

UIOutput.make(tableRow, "student-td");
UIOutput.make(tableRow, "student-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.student")));
UILink.make(tableRow, "edit-student", (String)null, "")
.decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.student")));

Expand Down Expand Up @@ -2829,7 +2829,7 @@ else if(questionStatus == Status.FAILED)


if(canEditPage) {
UIOutput.make(tableRow, "question-td");
UIOutput.make(tableRow, "question-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.question")));

// always show grading panel. Currently this is the only way to get feedback
if( !cameFromGradingPane) {
Expand Down Expand Up @@ -2939,7 +2939,7 @@ else if(questionStatus == Status.FAILED)

UIOutput.make(tableRow, "item-groups-titles-checklist", itemGroupTitles);

UIOutput.make(tableRow, "editchecklist-td");
UIOutput.make(tableRow, "editchecklist-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-checklist").replace("{}", i.getName())));

GeneralViewParameters eParams = new GeneralViewParameters();
eParams.setSendingPage(currentPage.getPageId());
Expand Down Expand Up @@ -2982,7 +2982,7 @@ else if(questionStatus == Status.FAILED)
eParams.setSendingPage(currentPage.getPageId());
eParams.setItemId(i.getId());
eParams.viewID = EditPageProducer.VIEW_ID;
UIOutput.make(tableRow, "edittext-td");
UIOutput.make(tableRow, "edittext-td").decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.textbox").replace("{}", Integer.toString(textboxcount))));
UIInternalLink.make(tableRow, "edit-link", (String)null, eParams).decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.edit-title.textbox").replace("{}", Integer.toString(textboxcount))));
textboxcount++;
}
Expand Down

0 comments on commit 6b099ba

Please sign in to comment.