Index: tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowItemProducer.java =================================================================== --- tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowItemProducer.java (revision 123346) +++ tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowItemProducer.java (working copy) @@ -199,7 +199,6 @@ decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.help-button"))); UIOutput.make(tofill, "helpimage2"). - decorate(new UIFreeAttributeDecorator("src", iconBase + "help.gif")). decorate(new UIFreeAttributeDecorator("alt", messageLocator.getMessage("simplepage.help-button"))); UIOutput.make(tofill, "helpnewwindow2", @@ -213,8 +212,7 @@ decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.reset-button"))); UIOutput.make(tofill, "resetimage2"). - decorate(new UIFreeAttributeDecorator("src", iconBase + "reload.gif")). - decorate(new UIFreeAttributeDecorator("alt", + decorate(new UIFreeAttributeDecorator("alt", messageLocator.getMessage("simplepage.reset-button"))); } Index: tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java =================================================================== --- tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java (revision 123346) +++ tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java (working copy) @@ -158,7 +158,7 @@ // marker between used and not used UIContainer row = UIBranchContainer.make(tofill, "item:"); UIOutput.make(row, "seq", "---").decorate(new UIFreeAttributeDecorator("class", "marker")); - UIOutput.make(row, "text-snippet", messageLocator.getMessage(secondPageId == null ? "simplepage.reorder-belowdelete" : "simplepage.reorder-aboveuse")).decorate(new UIFreeAttributeDecorator("style", "font-weight: bold;padding-left:3em")); + UIOutput.make(row, "text-snippet", messageLocator.getMessage(secondPageId == null ? "simplepage.reorder-belowdelete" : "simplepage.reorder-aboveuse")); second = true; continue; } @@ -189,7 +189,7 @@ } UIComponent del = UIOutput.make(row, "dellink").decorate(new UIFreeAttributeDecorator("alt", messageLocator.getMessage("simplepage.delete"))); if (second) - del.decorate(new UIFreeAttributeDecorator("style", "display:none")); + del.decorate(new UIFreeAttributeDecorator("style", "display:block")); } Index: tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java =================================================================== --- tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java (revision 123346) +++ tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java (working copy) @@ -746,7 +746,6 @@ decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.help-button"))); UIOutput.make(tofill, (pageItem.getPageId() == 0 ? "helpimage" : "helpimage2")). - decorate(new UIFreeAttributeDecorator("src", iconBase + "help.gif")). decorate(new UIFreeAttributeDecorator("alt", messageLocator.getMessage("simplepage.help-button"))); UIOutput.make(tofill, (pageItem.getPageId() == 0 ? "helpnewwindow" : "helpnewwindow2"), @@ -759,9 +758,8 @@ "location.href='" + reseturl + "'; return false")). decorate(new UIFreeAttributeDecorator("title", messageLocator.getMessage("simplepage.reset-button"))); - UIOutput.make(tofill, (pageItem.getPageId() == 0 ? "resetimage" : "resetimage2")). - decorate(new UIFreeAttributeDecorator("src", iconBase + "reload.gif")). - decorate(new UIFreeAttributeDecorator("alt", + UIOutput.make(tofill, (pageItem.getPageId() == 0 ? "resetimage" : "resetimage 2")). + decorate(new UIFreeAttributeDecorator("alt", messageLocator.getMessage("simplepage.reset-button"))); } @@ -982,8 +980,15 @@ case SimplePageItem.BLTI: itemClassName = "bltiType"; break; } - if (listItem) + + + if (listItem){ itemClassName = itemClassName + " listType"; + } + if (canEditPage) { + itemClassName = itemClassName + " canEdit"; + } + tableRow.decorate(new UIFreeAttributeDecorator("class", itemClassName)); // you really need the HTML file open at the same time to make @@ -1114,7 +1119,7 @@ // right. Otherwise the // description block will display underneath if ("button".equals(i.getFormat())) { - linkdiv.decorate(new UIFreeAttributeDecorator("style", "float:left")); + linkdiv.decorate(new UIFreeAttributeDecorator("style", "float:none")); } // for accessibility if (navButton) { @@ -1569,7 +1574,7 @@ item2.decorate(new UIFreeAttributeDecorator("type", mimeType)); } if (canEditPage) { - item2.decorate(new UIFreeAttributeDecorator("style", "border: 1px solid black")); + //item2.decorate(new UIFreeAttributeDecorator("style", "border: 1px solid black")); } // some object types seem to need a specification @@ -2856,7 +2861,7 @@ fileparams.setResourceType(true); fileparams.viewID = ResourcePickerProducer.VIEW_ID; - UILink link = UIInternalLink.make(form, "mm-choose", messageLocator.getMessage("simplepage.choose_existing"), fileparams); + UILink link = UIInternalLink.make(form, "mm-choose", messageLocator.getMessage("simplepage.choose_existing_or"), fileparams); UICommand.make(form, "mm-add-item", messageLocator.getMessage("simplepage.save_message"), "#{simplePageBean.addMultimedia}"); UIInput.make(form, "mm-item-id", "#{simplePageBean.itemId}"); Index: tool/src/resources/messages.properties =================================================================== --- tool/src/resources/messages.properties (revision 123346) +++ tool/src/resources/messages.properties (working copy) @@ -165,6 +165,8 @@ simplepage.link=Add Link simplepage.addlink_header=Add A New Link simplepage.addLink_label=URL: +simplepage.addLink_label_add=Add a URL: +simplepage.addLink_label_add_or=Or add a URL simplepage.editText=Edit This Text simplepage.editItem=Edit simplepage.editItemBelow=Edit Item Below @@ -197,9 +199,10 @@ simplepage.deleted-group= simplepage.deleted-entity=*Deleted* -simplepage.add_file_instructions=You may supply a file to be uploaded, specify a URL where the item is available, or choose a file that has already been uploaded. -simplepage.upload_label=Upload file: +simplepage.add_file_instructions=You may upload a new file, select an existing file from Resources, or supply a URL to a file on the web. +simplepage.upload_label=Upload file simplepage.choose_existing=Choose Existing File +simplepage.choose_existing_or=Or select an existing resource simplepage.choose_existing_page=Choose Existing Page simplepage.import_cc_button=Import CC @@ -228,13 +231,14 @@ simplepage.reorder=Reorder simplepage.reorder-tooltip=Reorder items on this page simplepage.reorder_header=Reorder Page Items -simplepage.reorder_instructions=Please drag and drop the items below to reorder them. Or select a number and use the control key plus uparrow or downarrow. In some cases you may need to hit the arrow twice. +simplepage.reorder_instructions=Please drag and drop the items below to reorder them. To delete, drag item to delete bin. +simplepage.reorder_instructions_sr= Or select one and use the control key plus uparrow or downarrow to reorder and control + shift to move them between bins. simplepage.reorder.tooltip=Change the order of items on this page simplepage.reorder-duplicates=Unable to continue. Some of the items have duplicate sequences. simplepage.reorder-belowdelete=Move items below this marker to delete them simplepage.reorder-aboveuse=Move items above this marker to put them on the page simplepage.reorder-addpage=Add items from another page - +simplepage.reorder_delebox=Drop items here to delete simplepage.save=Save simplepage.edit_youtubelink=Edit Youtube Link simplepage.edit_youtube=Edit Youtube Link Below Index: tool/src/webapp/images/reload_h.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/gif Property changes on: tool/src/webapp/images/reload_h.gif ___________________________________________________________________ Added: svn:mime-type + image/gif Index: tool/src/webapp/images/help.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/gif Property changes on: tool/src/webapp/images/help.gif ___________________________________________________________________ Added: svn:mime-type + image/gif Index: tool/src/webapp/images/help_h.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/gif Property changes on: tool/src/webapp/images/help_h.gif ___________________________________________________________________ Added: svn:mime-type + image/gif Index: tool/src/webapp/images/reload.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/gif Property changes on: tool/src/webapp/images/reload.gif ___________________________________________________________________ Added: svn:mime-type + image/gif Index: tool/src/webapp/css/Simplepagetool.css =================================================================== --- tool/src/webapp/css/Simplepagetool.css (revision 123346) +++ tool/src/webapp/css/Simplepagetool.css (working copy) @@ -42,13 +42,12 @@ text-align: center; } .expert { - margin-top: 15px; - border: 1px solid black; + margin-top: 10px; background-color: #eee; - padding: 4px; + padding: 5px; } .nextprev { - font-size: 100% !important + font-size: 95% !important } #error { left: 10px; @@ -62,17 +61,17 @@ } .breadcrumbs span { display: inline-block; - margin-top: 1px; - margin-bottom: 3px; } -.title { - font-weight: bold; - font-size: 1.2em; - color: #333; - display: inline-block; - margin-top: 1px; - margin-left: 2px; +.breadcrumbs span > span { + margin-left: 5px; + margin-right:5px } +.breadcrumbs span > span.bold { + margin-left:0; +} +.breadcrumbs + .singlePageTitle { + display:none +} .italic { font-style: italic } @@ -105,6 +104,39 @@ border-style: solid; border-width: 2px; } +.instructionPanel,.controlsPanel { + border:1px solid #ccc; + font-size:12px; + background: #eee; + padding:5px; + margin:5px 0 +} +.controlsPanel { + padding:0; + background:none; + border: 1px solid transparent; +} +.controlsPanel .shorttext, .controlsPanel .longtext, .controlsPanel .filepicker{ + margin:.4em 0 +} +.controlsPanel .act { + margin:1em 0; +} +.controlsPanel .act .deleteButton, .act .deleteButton { + background: none !important; + border: none !important; + box-shadow: none !important; + color: #c00 !important; + text-shadow:none !important; + +} +.act .deleteButton { + float: none +} +.controlsPanel .act .deleteButton:hover, .act .deleteButton:hover { + background: none !important; + cursor: pointer; +} .inset-text { margin-top: 1em; border-style: solid; @@ -132,6 +164,14 @@ color: black; text-decoration: none !important; } +.gradingTable a.ui-button .ui-button-text{ + font-size:10px; + font-weight:normal; +} +.ui-buttonset .ui-button { + margin-right: 3px !important; +} + /* ff2, buttons don't work */ a.edit-link:link, a.edit-link:visited, a.itemLink:link, a.itemLink:visited, a.multimedia-edit:link, a.multimedia-edit:visited, a.edit-youtube:link, a.edit-youtube:visited, a.edit-movie:link, a.edit-movie:visited { text-decoration: none !important; @@ -148,10 +188,10 @@ margin-bottom: 1.0em; } .rowdescription { - margin-left: 2em + margin: 8px 0 2px 30px; } .description { - margin-top: 0.5em; + margin-top: 0.5em; margin-bottom: 1em; } .youtubeWidth { @@ -164,9 +204,76 @@ width: 95%; margin-bottom: 0.5em; } -.edit-col { - padding-right: 10px + +.mainList { + margin: 0; + padding:0; + list-style:none; } +.mainList li { + position: relative; + padding:10px; + margin: 15px 0; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + border: 1px solid #ccc; +} +.mainList li:hover { + border: 1px solid #B3B3B3; +} +.mainList li.canEdit > div { + position: relative; + padding-left: 35px +} +.mainList li.canEdit > div.edit-col { + float:left; + padding-left: 0; + z-index:4 +} +.mainList li.question,.mainList li.studentContentType, .mainList li.commentsType { + background:#ffe +} +.mainList li.textType, .mainList li.multimediaType { + border:1px solid transparent +} +.mainList li.question .multipleChoiceAnswer { + margin:10px 25px; +} +.mainList li.question .multipleChoiceForm input.bold { + margin:5px 0px 0px 20px !important +} +.questionStatusText { + padding: 15px 20px; +} +.mainList li .textbox { + +} +/*maybe a universal selector, instead of a p*/ +.mainList li .textbox p:first-child{ + margin-top:0; +} +/*maybe a universal selector, instead of a p*/ +.mainList li .textbox p:last-child{ + margin-bottom:0; +} + +.statusCol { + position: absolute; + top:2px; + left:2px; + z-index:2; +} + +.canEdit .statusCol { + top:-8px; + left: -8px; + z-index: 4; +} +.link-div h3.link-div-head { + display:inline; + font-size:110%; +} .ui-button-text { font-weight: bold; padding: 0px 4px !important; @@ -184,12 +291,131 @@ clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ clip: rect(1px, 1px, 1px, 1px); } -.fl-reorderer-movable-hover, .fl-reorderer-movable-selected { - background-color: #ccc +.columnSetup2 { + padding:5px; + float:none;height:100%;overflow:hidden;margin:1em 0 } -.fl-reorderer-movable-dragging { - background-color: #faa + +.layoutReorderer-module-content { + padding: 6px; + width: 95%; + overflow: auto; } + +.flc-reorderer-module { + border: 1px solid #ccc; + margin:5px 0; + position:relative; + padding:5px; +} +.flc-reorderer-module:focus { + outline:1px dashed #000 +} +.flc-reorderer-module:hover { + border:1px solid #000; +} +.reordSeqContainer { + position: absolute; + width:50px; + top:5; + left:0; + padding:5px; + +} +.reordItemContainer { + padding: 5px 20px 5px 30px; +} +.reordItemContainerDesc { + margin-top:5px; + text-overflow: ellipsis; + width: 100%; + white-space: nowrap; + overflow: hidden; +} +.highlightEl { + background:#ffa +} + +.col2 .reordItemContainer { + padding: 5px; +} +.col2 .reordSeqContainer, .col2 .reordDeleteContainer { + display: none +} + +.reordDeleteContainer { + position: absolute; + width:17px; + top:5px; + right:5px; + +} +/** + * Interaction styling. + */ + +.layoutReorderer-movable-selected { + border: 1px solid #fff; +} + +.layoutReorderer-avatar { + background-color:#ccc; + outline: 2px solid #000; + opacity: 0.5; + filter: alpha(opacity=50); /* ie opacity fix */ +} +.layoutReorderer-avatar .layoutReorderer-module-dragbar, +.layoutReorderer-avatar .layoutReorderer-module-content { + /* hide contents of the module's avatar, while dragging. */ + visibility: hidden; +} + +.layoutReorderer-movable-dragging { + margin: 6px 2px 6px 12px; +} + +.layoutReorderer-movable-mousedrag { + /* hide the original module while being dragged. */ + display:none; +} + +.layoutReorderer-dropMarker { + background: #9f9 url("/library/image/silk/arrow_right.png") 1% 50% no-repeat; + height: 20px; + padding: 0 0 0 0; + margin-left: 1em; + margin-right: 1em; +} + +.col1 { + min-width:60%; + width:60%; + min-height:50px; +} +.col2 { + border: 1px solid #CCCCCC; + margin-left: 16px; + margin-top: 4px; + min-height: 50px; + min-width: 30%; + padding: 5px 5px 5px; + width: 30%; +} +.col1, .col2{ + float:left; + background:#fff; +} +.deleteListMessage { + padding:5px; + padding-left: 25px; + background: #fff url(/library/image/silk/bin.png) 5px 5px no-repeat; +} +.deleteListMessageEmpty { + padding:5px; + padding-left: 25px; + background: #fff url(/library/image/silk/bin_empty.png) 5px 5px no-repeat; + +} .afterheader { margin-top: 1em } @@ -204,40 +430,36 @@ .author { margin-right: 15px; font-weight: bold; - color: #039; } +.replaceWithComments { + margin:5px 5px 5px 20px; +} .commentPageTitle { - margin-right: 10px; + margin: 0 10px; color: #906; } .commentDiv { - margin-top: 5px; - margin-bottom: 5px; - background-color: #e4edff; - padding: 5px 10px; + position:relative } +.gradingTable .commentDiv { + padding:5px; + margin-top:5px; + outline:1px solid #ccc; +} .commentBody { - margin-top: 3px + margin: 0 0 0 35px; } .commentsCell { margin-bottom: 10px } .specialCommenter { - background-color: white; padding: 0 3px 1px 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - padding-top: 1px; - padding-bottom: 1px; } /* Commenter looking at their own comment */ .personalComment { - background-color: white } /* Site Owner Comment */ .ownerComment { - background-color: #CCCEED; color: black; } .item-group-titles { @@ -251,6 +473,17 @@ .nextprev .usebutton span { font-size: inherit } +.commentDiv .editLink, .commentDiv .deleteLink, .commentDiv .replyLink { + padding:5px; +} +.commentGradePanel { + position: absolute; + top: 10px; + right: 0; +} +.commentDiv .editLink:hover, .commentDiv .deleteLink:hover, .commentDiv .replyLink:hover { + cursor:pointer; +} .link-div .usebutton { font-size: 160% } @@ -264,9 +497,11 @@ display: none } .imgCell { +/* height: 10px; width: 10px; -} + +*/} .studentCell { padding-left: 7px } @@ -274,19 +509,16 @@ color: black; margin-top: 0px; } -.studentContentTitle { - color: black; - margin-top: 0px; - margin-bottom: .5em; - margin-left: 40px; +.studentContentTitle, .mainList li.question .questionText, h3.author { + margin:0 2px 5px 3px; + display:inline; } .studentContentTable { - border: none; - background-color: #e4edff; - padding: 4px; - padding-bottom: 1em; - padding-top: 1em; } +.studentContentTable .studentRow{ + padding:5px 0; +} + .duecol { padding-left: 2em !important } @@ -295,13 +527,19 @@ display: inline; position: relative; } +ul#toolbar li.dropdown a { + text-decoration:none +} +ul#toolbar li em { + font-style:normal; +} #dropDownDiv { position: absolute; width: 350px; - margin-top: 0.9em; + margin-top: 0; margin-left: 0.5em; background-color: #EEE; - padding: 10px !important; + padding: 5px !important; background: #eeeeee !important; background: -moz-linear-gradient(top, #eeeeee 0%, #e4e4e4 100%) !important; background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eeeeee), color-stop(100%,#e4e4e4)) !important; @@ -309,47 +547,40 @@ background: -o-linear-gradient(top, #eeeeee 0%,#e4e4e4 100%) !important; background: -ms-linear-gradient(top, #eeeeee 0%,#e4e4e4 100%) !important; background: linear-gradient(top, #eeeeee 0%,#e4e4e4 100%) !important; - border: 1px solid #d1d1d1 !important; - z-index: 10000; - padding: 7px; + border: 1px solid #d1d1d1 !important; + z-index: 10000; + -webkit-box-shadow: 1px 1px 3px 2px #eeeeee; + box-shadow: 1px 1px 3px 2px #eeeeee; } -/* have to undo much of the .navintratool */ -#dropDownDiv a { - border: none; - background-color: inherit; - padding: 0px; - margin: 0px 1em 0px 0px !important; +#dropDownDiv ul { + margin:0; + padding: 0; } -#dropDownDiv span { - padding: 0px; - border: none; - background-color: inherit; - margin: 0px; +#dropDownDiv li { + border-top:1px solid #ccc !important; + background: #fff !important; + padding:5px !important; + margin:0; + display:block; } -#dropDownDiv * { - background: none !important; - border: none !important; - font-weight: normal !important; - margin: 0 !important; - padding: 0 !important; +#dropDownDiv li:first-child { + border-top:none !important; } -#dropDownDiv span { - display: block !important +#dropDownDiv li a { + display:block; + padding: 5px 0 !important; } -#dropDownDiv span>span { - display: inline !important +#dropDownDiv li div { + font-size: .85em !important } -#dropDownDiv a, #dropDownDiv a>span { - font-weight: bold !important -} -#dropDownDiv a:hover { - color: inherit !important -} span.nextprev { - margin-left: 20px + /* +margin-left: 20px; +*/ + } a.nextprev { - margin-left: 5px + margin-left: 5px; } img { z-index: 1 @@ -376,7 +607,9 @@ border-top: 3px solid white } .first-row { - background-color: #e8e8e8 + /* +background-color: #e8e8e8 +*/ } .first-row td { padding: 0px; @@ -384,6 +617,9 @@ .details-row td { padding-left: 2em } +.details-row td:hover { + background: #fff +} .gradingarea { margin-left: 1em; padding: 1px 5px; @@ -427,4 +663,236 @@ } .question-multiplechoice-answer, .question-shortanswer-answer { width: 250px; -} \ No newline at end of file +} +div[role="dialog"] { + -webkit-box-shadow: 1px 1px 2px 1px #ccc; + box-shadow: 1px 1px 2px 1px #ccc; +} +.commentsType div[role="dialog"] { + -webkit-box-shadow: 0px 0px 0px 0px #ccc; + box-shadow: 0px 0px 0px 0px #ccc; + +} +#multipleChoiceAnswers, #copyableShortanswerDiv { + line-height:30px; +} + +.controlsPanel fieldset { + margin 10px 0 +} + +.deleteCandidate td:first-child { + background: transparent url('/library/image/silk/delete.png') 2px 3px no-repeat; +} +.deleteCandidate td:first-child div { + margin-left: 25px; +} +/* dialog is open, hide all edit links till it closes */ +.mainList .edit-colHidden { + display:none; +} + +.pageList { + padding: 0 10px; + list-style:none; +} +.pageList li { + padding:5px; +} +.pageList img { + vertical-align:middle; +} +/* neeeded by LB for skinning - goes in tool.css so that the + * portlet title looks like the rest in the system. + * + * if adopter wants to include overrides in their tool.css these are the + * minimal adjustments (to be added [edited] to tool.css so that the title bar looks + * like the rest of the tools) below: + * + .neoPortletTitleWrap { + border-bottom: 2px solid #555 !important; + } + .portletTitle .action a.help { + background: url(images/help.gif) center right no-repeat !important; + } + .portletTitle .action a.help:hover, .portletTitle .action a.help:focus { + background: url(images/help_h.gif) center right no-repeat !important; + } + .portletTitle .title a.reload { + background: url(images/reload.png) center left no-repeat !important; + } + .portletTitle .title a.reload:hover, .portletTitle .title a.reload:focus { + background: url(images/reload_h.png) center left no-repeat !important + } +*/ +.neoPortletTitleWrap { + border-bottom: 2px solid #319DCE; + border-radius:0 +} +.portletTitle { + width: 100%; + height: 100%; + overflow: hidden; +} +.portletTitle .action { + padding: 2px -1px 6px 2px; + text-align: right; + vertical-align: middle; +} +.portletTitle .action a#jsr-edit { + padding: 2px; + background: url(../images/page_edit.gif) center right no-repeat; +} +.portletTitle .action a#jsr-edit:hover { + background: url(../images/page_edit.gif) center right no-repeat +} +.portletTitle .action img { + margin: 0; + vertical-align: text-bottom; + width: 18px; + border: none; + height: 18px; +} +.portletTitle .action a.help { + background: url(../images/help.gif) center right no-repeat; + text-align: left; + padding: 0; + text-decoration: none !important; + width: 1em; + height: 1.5em; + outline: none; +} +.portletTitle .title a:focus, .portletTitle .action a:focus { + outline: black dotted thin +} +.portletTitle .action a.help:hover, .portletTitle .action a.help:focus { + background: url(../images/help_h.gif) center right no-repeat +} +.portletTitle .action a.tool-directurl{ + padding:2px; + background: url(/library/image/silk/link.png) center right no-repeat; +} +.portletTitle .action a.tool-directurl:hover{ + background: url(/library/image/silk/link_go.png) center right no-repeat; +} +.direct-url-wrap { + font-size: 85%; + color: #555; +} +.direct-url-wrap textarea { + color: #000; + overflow:auto; + width:250px; + display:block; +} +.portletTitle .title { + padding: 2px 4px 6px 0; + height: 1em; + float: left; + color: #000; +} +.portletTitle .title img { + margin: 0; + vertical-align: text-bottom; + width: 18px; + border: none; + height: 18px; +} +.portletTitle .title h2 { + display: inline; + margin: 0; + padding: 0; + color: #444; + font-weight: bold; + font-family: 'Helvetica Neue', Arial, sans-serif; + font-size: 1.2em !important; +} +.portletTitle .title h2 a { + text-decoration: none; +} +.portletTitle .title h2 .siteTitle { + color: #333 +} +.portletTitle .title a.reload { + background: url(../images/reload.gif) center left no-repeat; + text-decoration: none !important; + border: 1px solid #fff; + height: 1.5em; + outline: none; +} +.portletTitle .title a.reload:hover, .portletTitle .title a.reload:focus { + background: url(../images/reload_h.gif) center left no-repeat +} + +/* + alternate treatment for list - can go in tool.css +*/ +/* +.edit-col { + position: absolute !important; + clip: rect(1px 1px 1px 1px); + clip: rect(1px, 1px, 1px, 1px); + top: -1px; + right:-2px; + z-index:3; + padding:0; + float:none; +} + +.mainList li:hover .edit-col{ + display:block; + clip:auto; +} +.mainList li:hover .edit-colHidden { + display:none; +} +.mainList li.canEdit > div { + padding: 0 !important +} + +.mainList li .edit-col a.ui-button:link, .mainList li .edit-col a.ui-button:visited { + text-decoration: none !important; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-bottomleft: 5px; + border-bottom-left-radius: 5px; + width:30px; + height:30px; + background-image: url(/library/image/silk/application_edit.png); + background-position:center center; + background-repeat: no-repeat; +} + +.mainList li .edit-col a span { + display: none; +} +.mainList li.canEdit:hover { + border:1px solid #ccc; +} +.mainList li.assessmentType .edit-col, + .mainList li.commentsType .edit-col, + .mainList li.studentContentType .edit-col, + .mainList li.resourceType .edit-col, + .mainList li.assignmentType .edit-col, + .mainList li.forumType .edit-col, + .mainList li.pageType .edit-col, + .mainList li.assessmentType .edit-col, + .mainList li.studentContentType .edit-col, + .mainList li.resourceType .edit-col, + .mainList li.assignmentType .edit-col, + .mainList li.forumType .edit-col, + .mainList li.pageType .edit-col { +} +.editInProgress { + background:#eee !important; + border:1px dashed #aaa !important; +} +.editInProgress * { + opacity:.50; +} +*/ + /* +end alternate treatment for list +*/ Index: tool/src/webapp/js/show-page.js =================================================================== --- tool/src/webapp/js/show-page.js (revision 123346) +++ tool/src/webapp/js/show-page.js (working copy) @@ -272,6 +272,7 @@ $(".edit-youtube").click(function(){ closeDropdown(); + $('li').removeClass('editInProgress'); $("#editgroups-youtube").after($("#grouplist")); $("#grouplist").hide(); $("#editgroups-youtube").hide(); @@ -296,6 +297,8 @@ $("#youtubeWidth").val(row.find(".mm-width").text()); $("#description4").val(row.find(".description").text()); var position = row.position(); + $('.edit-col').addClass('edit-colHidden'); + $(this).closest('li').addClass('editInProgress'); $("#youtube-dialog").dialog("option", "position", [position.left, position.top]); oldloc = $(this); $('#youtube-dialog').dialog('open'); @@ -311,6 +314,7 @@ $('.edit-movie').click(function(){ closeDropdown(); + $('li').removeClass('editInProgress'); //var object = this.parentNode.parentNode.childNodes[3].childNodes[1]; $("#expert-movie").hide(); $("#expert-movie-toggle-div").show(); @@ -342,6 +346,8 @@ $("#description3").val(row.find(".description").text()); $("#mimetype4").val(row.find(".mm-type").text()); var position = row.position(); + $('.edit-col').addClass('edit-colHidden'); + $(this).closest('li').addClass('editInProgress'); $("#movie-dialog").dialog("option", "position", [position.left, position.top]); oldloc = $(this); $("#movie-dialog").dialog('open'); @@ -352,6 +358,7 @@ $(".edit-comments").click(function(){ closeDropdown(); + $('li').removeClass('editInProgress'); $("#editgroups-comments").after($("#grouplist")); $("#grouplist").hide(); $("#editgroups-comments").hide(); @@ -408,6 +415,8 @@ } var position = row.position(); + $('.edit-col').addClass('edit-colHidden'); + $(this).closest('li').addClass('editInProgress'); $("#comments-dialog").dialog("option", "position", [position.left, position.top]); oldloc = $(this); $('#comments-dialog').dialog('open'); @@ -423,6 +432,7 @@ $(".edit-student").click(function(){ closeDropdown(); + $('li').removeClass('editInProgress'); $("#editgroups-student").after($("#grouplist")); $("#grouplist").hide(); $("#editgroups-student").hide(); @@ -531,6 +541,8 @@ } var position = row.position(); + $('.edit-col').addClass('edit-colHidden'); + $(this).closest('li').addClass('editInProgress'); $("#student-dialog").dialog("option", "position", [position.left, position.top]); oldloc = $(this); $('#student-dialog').dialog('open'); @@ -582,6 +594,7 @@ $('.question-link').click(function(){ closeDropdown(); + $('li').removeClass('editInProgress'); var position = $(this).position(); $("#questionEditId").val("-1"); @@ -604,8 +617,6 @@ $("#question-correct-text").val(""); $("#question-incorrect-text").val(""); - $("#delete-question-div").hide(); - $("#question-dialog").dialog("option", "position", [position.left, position.top]); oldloc = $(this); $('#question-dialog').dialog('open'); @@ -734,6 +745,10 @@ $("#delete-question-div").show(); var position = row.position(); + $("#delete-question-div").hide(); + $('.edit-col').addClass('edit-colHidden'); + $(this).closest('li').addClass('editInProgress'); + $("#question-dialog").dialog("option", "position", [position.left, position.top]); oldloc = $(this); $('#question-dialog').dialog('open'); @@ -774,6 +789,9 @@ $(".edit-link").click(function(){ closeDropdown(); + $('li').removeClass('editInProgress'); + $('.edit-col').addClass('edit-colHidden'); + $(this).closest('li').addClass('editInProgress'); $("#require-label2").hide(); $("#item-required2").hide(); $("#assignment-dropdown-selection").hide(); @@ -1038,7 +1056,7 @@ setUpRequirements(); $("#item-id").val(row.find(".current-item-id2").text()); $("#edit-item-error-container").hide(); - var position = $(this).position(); + var position = $(this).closest('li').position(); $("#edit-item-dialog").dialog("option", "position", [position.left, position.top]); oldloc = $(this); $("#edit-item-dialog").dialog('open'); @@ -1086,6 +1104,7 @@ $("#mm-choose").attr("href",href); $("#add-multimedia-dialog").prev().children(".ui-dialog-title").text($(this).text()); var position = $(this).position(); + $("#add-multimedia-dialog").dialog("option", "position", [position.left, position.top]); $(".mm-additional").show(); $(".mm-additional-website").hide(); @@ -1143,6 +1162,7 @@ $(".multimedia-edit").click(function(){ closeDropdown(); + $('li').removeClass('editInProgress'); $("#expert-multimedia").hide(); $("#expert-multimedia-toggle-div").show(); $("#editgroups-mm").after($("#grouplist")); @@ -1183,6 +1203,9 @@ "pageItemId=" + row.find(".mm-itemid").text())); $("#multimedia-item-id").val(row.find(".mm-itemid").text()); var position = row.position(); + $('.edit-col').addClass('edit-colHidden'); + $(this).closest('li').addClass('editInProgress'); + $("#edit-multimedia-dialog").dialog("option", "position", [position.left, position.top]); oldloc = $(this); $("#edit-multimedia-dialog").dialog('open'); @@ -1232,7 +1255,7 @@ }); $('body').bind('dialogopen', function(event) { - hideMultimedia(); + //hideMultimedia(); }); $('body').bind('dialogclose', function(event) { @@ -1249,7 +1272,9 @@ $('#comments-dialog').dialog('isOpen') || $('#student-dialog').dialog('isOpen')) || $('#question-dialog').dialog('isOpen')) { - unhideMultimedia(); + //unhideMultimedia(); + $('.edit-col').removeClass('edit-colHidden'); + $('li').removeClass('editInProgress') } }); @@ -1290,7 +1315,8 @@ } // Closes admin if statement - $(".showPollGraph").click(function() { + $(".showPollGraph").click(function(e) { + e.preventDefault(); var pollGraph = $(this).parents(".questionDiv").find(".questionPollGraph"); if($(this).find("span").text() === $(this).parent().find(".show-poll").text()) { @@ -1314,7 +1340,7 @@ $(this).find("span").text($(this).parent().find(".show-poll").text()); } - setMainFrameHeight(window.name); + resizeFrame('grow') }); function submitgrading(item) { @@ -1432,6 +1458,7 @@ function closeAddMultimediaDialog() { $("#add-multimedia-dialog").dialog("close"); oldloc.focus(); + $(oldloc).closest('li').removeClass('editInProgress'); } function closeEditTitleDialog() { @@ -1948,3 +1975,22 @@ $("#extraShortanswers").empty(); } + +resizeFrame = function (updown) { + var frame = parent.document.getElementById( window.name ); + if( frame ) { + if(updown=='shrink') + { + var clientH = document.body.clientHeight + 30; + } + else + { + var clientH = document.body.clientHeight + 30; + } + $( frame ).height( clientH ); + } else { + throw( "resizeFrame did not get the frame (using name=" + window.name + ")" ); + } + }; + + Index: tool/src/webapp/js/reorder.js =================================================================== --- tool/src/webapp/js/reorder.js (revision 123346) +++ tool/src/webapp/js/reorder.js (working copy) @@ -1,57 +1,68 @@ -var reorderlist = null; +(function($, fluid){ + //fluid.setLogging(true); + initlayoutReorderer = function(){ + fluid.reorderLayout("#layoutReorderer", { + listeners: { + afterMove: function(args){ + recalculate(); + } + }, + styles: { + defaultStyle: "layoutReorderer-movable-default", + selected: "layoutReorderer-movable-selected", + dragging: "layoutReorderer-movable-dragging", + mouseDrag: "layoutReorderer-movable-mousedrag", + dropMarker: "layoutReorderer-dropMarker", + avatar: "layoutReorderer-avatar" + }, + disableWrap: true + }); + }; +})(jQuery, fluid); -// aftermove is used to enable or disable delete button -// depending upon where the row ends up +var recalculate = function(){ + var keepList = ''; + var removeList = ''; + jQuery('.col1 .layoutReorderer-module').each(function(i){ + i > 0 ? keepList = keepList + ' ' + $(this).find('.reorderSeq').text() : keepList = $(this).find('.reorderSeq').text(); + }); + jQuery('.col2 .layoutReorderer-module').each(function(i){ + i > 0 ? removeList = removeList + ' ' + $(this).find('.reorderSeq').text() : removeList = $(this).find('.reorderSeq').text(); + }); + + keepList=keepList + ' --- '; + keepList=keepList.replace(' ',' '); + removeList=removeList.replace(' ',' '); + jQuery('input[id=order]').val(keepList + removeList); + + if (jQuery('.col2 .layoutReorderer-module').length===0){ + jQuery('.col2 #deleteListHead').attr('class','deleteListMessageEmpty'); + } + else { + jQuery('.col2 #deleteListHead').attr('class','deleteListMessage'); + } + $('.layoutReorderer-module').find('.marker').closest('.layoutReorderer-module').remove(); +}; +$(document).ready(function(){ + $('.layoutReorderer-module').find('.marker').closest('.layoutReorderer-module').remove(); + recalculate(); -var aftermoveprocess = function (el,o) { - aftermover(el); -} +/* + jQuery('.col1 .layoutReorderer-module').each(function(i){ + i > 0 ? ids = ids + ' ' + $(this).find('.reorderSeq').text() : ids = $(this).find('.reorderSeq').text(); + }); + + ids=ids + ' --- ' + ids=ids.replace(' ',' ') + jQuery('input[id=order]').val(ids); -function aftermover(el,pos) { - // position after move - var newpos = el.prevAll().length; - var list = $('#listx'); - // position of the marker line - var markerpos = list.find('.marker').parent().prevAll().length; - // enable delete for items above the marker - if (newpos > markerpos) - el.find('img').hide(); - else - el.find('img').show(); -} - -jQuery(document).ready(function () { - var opts = { - selectors: { - movables: ".movable" - }, - listeners: { - afterMove: aftermoveprocess - } - }; - - reorderlist = fluid.reorderList("#listx", opts); - return reorderlist; +*/ + $('.deleteAnswerLink').click(function(e){ + e.preventDefault(); + $(this).closest('.layoutReorderer-module').addClass('highlightEl').hide().appendTo('#reorderCol2').fadeIn(2000, function(){ + $(this).removeClass('highlightEl'); + }); + + recalculate(); + }); }); - -// delete moves the item to the end, i.e. below the line -function deleteitem(el) { - var row = el.parent().parent(); - $('#listx').append(row); - reorderlist.refresh(); - aftermover(row); -} - -function computeorder() { - var rows = document.getElementById("itemTable").rows; - var order = ""; - var i = 0; - var max = rows.length; - - for (i = 0; i < max; i++) { - order = order + " " + rows[i].cells[0].innerHTML; - } - - $("#order").val(order); - return true; -} \ No newline at end of file Index: tool/src/webapp/templates/ShowPage.html =================================================================== --- tool/src/webapp/templates/ShowPage.html (revision 123346) +++ tool/src/webapp/templates/ShowPage.html (working copy) @@ -72,13 +72,6 @@ - - -
@@ -622,298 +933,286 @@

- -
-
+ +
-

- -
-

- -

- -
-

- -

-
- -

+

+ +
+

+ +

+ Path + +

+ +

+ + +

-
-

- -

+
+

+ +

-

- -

+

+ +

-

- -

+

+ +

-

- -

+

+ +

-

- -

+

+ +

-

- -

-
+

+ +

+
-

- -

+

+ +

-

- -

+

+ +

-
- -
- -
-
+
+ +
+ +
+
-
- -
-
-
-

- - -
- -
- -
+
+ +
+
+
+

+ + +
+ +
+ +
-
+
-

- -
-

+

+ +
+

-
- - - -
-
- - -
- - - -
-
- - - - - - -

- -

-

-
- -

-

-
- -
-
-
- -
-
- : - -
-
- - - - +
+ + + +
+
+

+ + +

+ +

+ + +

+
+

+ + +

+ + +

+ + + + +

+ +

+ +

+

+
+ +

+

+
+

+
+
+
+

+ + + +

+
-
-
- -

+ +
+

+

+ +

+ +

+ +

+
-

- -

- -

- -

+
+

+ + +

+

+ ...or choose exiting file +

-
+

+ + +

-
-

- -
-

- -

- -
-

- -

- -

- - - - - - - -
- + + + + + +
+
-
-
-

- -
-

+ +
+

+ +
+

-

- -
-

-

-

- -

-
-
-

- -

- -
-

- -

-
- -

-

- -

-

- -

-
-
+

+ +
+

+

+

+ +

+ +
+

+ +

+ +
+

+ +

+
+ +

+

+ +

+

+ +

+
+ + +
+ + + +
+ +
+

+ +

+
-
-
- : - -
-
- - - - - -
-

- -

-
- -
-

- -

-

-
-
-
-
- -
+
+

+ +

+

+
+
+
+
-
-
-

-
-
-

+ +
+

+
+
+

- -
+

+ + +
+ + +
+ +
-

- - -
- - -
- -
+

+ + +
+ + +
+ +
-

- - -
- - -
- -
+

+ + +
+ + +
+ +
-

- - -
- - -
- -
+

+ + +

+

+

-

- - -

-

-

- -
- +
+
@@ -924,112 +1223,129 @@
-
-

- * - -
-

- -
-
- -
- -
-
+ +

+ * + + +

+ +
+
+

+ + +

+

+ + +

+
+

+ + +

+

+ + +

+
+ + + calendar + +
- -
+
+ +
+

+ + + + + +

+
+ +
- -
-
- - - calendar - -
- -
- -
- - - - -
- -
- -
- - - - - - -
- -

-
- - - - +
+ + + +

+ + +

+

+

+
+

+ + +

+ - -
-
-
-
-

-

-
-
-
-

- * - -
-

- - - - -
+
+

+
+
+

+

+
+
+ +
+

+ * + + +

+

+ + + +

+

+ + +

+ +
+ + +
+
+
+
+
+
- -
+ + +

+ +

+
-
- - -
-

-

-
+
+
+
+
+

+ + +

+
+
+
- - -

- -

-
- -
-
-
- - -
-
-
@@ -1038,40 +1354,33 @@
-
-
- -
-

- - - -
- -
- -
-

-
-

-
- -

-

- -

-
-
-
-
- : - -
-
- - - -
+
+ +

+ + +

+

+ + +

+

+ + +

+

+
+ +

+

+ +

+

+ + + +

+
@@ -1082,8 +1391,7 @@
-
-
+

@@ -1110,18 +1418,11 @@

-
-
-
-
- : - -
-
- - - - +

+ + + +

@@ -1142,221 +1443,208 @@

- -
- -
- -
- - -
- - - -
- -
- - -
- - - -
- -

- -

-
-
- -
-
- : - -
-
- - - - - +
+
+ +

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ +

+
+

+ + + +

+
-
-
- -
- -
- - -
- - - -

- - -
- - -
- - -
- - -
-
-
- -
-
- -
-
- -
-
-
-
+ -
- - -
- - - -
+ +

+ + +

+

+ + +

+

+ + +

+ +

+

+ + +

+

+ + +

+

+ + +

+

+ + +

+

+ +

+
+
+ +

+
+

+
+
+
-

- -

- -
-
- -
-
- : - -
-
- - - - -
+

+ + +

+

+ + +

+

+ +

+
+ + + +
+
-
-
- -
- - -
- -
- -
- -
- -
- -
-

- - -
-
- - - -
-
-
- -
- -
-

-
-
- - - - - - - -
-
-
- -
- -

- - -
- -
- - - -

- -
-
- -
- - -

- - - - -
- - - -
-
- -
- -
-
- : - -
-
- - - - -
+
+
+ +
+ + +
+ +
+ +
+ +
+
+
+ +
+
+

+ + +
+
+ + + +
+
+
+
+
+ +
+
+

+
+
+ + + + + + + +
+
+
+
+

+

+ + +

+
+

+ + +

+

+ + +

+

+ + +

+
+
+ +
+
+
+ +
+

+ + +

+

+ + +

+
+
+

+ + + +

+
-
+
Index: tool/src/webapp/templates/EditPage.html =================================================================== --- tool/src/webapp/templates/EditPage.html (revision 123346) +++ tool/src/webapp/templates/EditPage.html (working copy) @@ -17,12 +17,12 @@

junk

- +

Enter your page content below
- +
@@ -63,12 +63,10 @@
-
-

- +

Index: tool/src/webapp/templates/ForumPicker.html =================================================================== --- tool/src/webapp/templates/ForumPicker.html (revision 123346) +++ tool/src/webapp/templates/ForumPicker.html (working copy) @@ -26,7 +26,7 @@

-
+
@@ -34,16 +34,20 @@
- - - - -
+ + + + +
+

+ +
- - - +

+ + +

Index: tool/src/webapp/templates/BltiPicker.html =================================================================== --- tool/src/webapp/templates/BltiPicker.html (revision 123346) +++ tool/src/webapp/templates/BltiPicker.html (working copy) @@ -41,7 +41,7 @@
- +
@@ -63,14 +63,16 @@
--> - - +

+ + +

-

+

Index: tool/src/webapp/templates/CommentGradingPane.html =================================================================== --- tool/src/webapp/templates/CommentGradingPane.html (revision 123346) +++ tool/src/webapp/templates/CommentGradingPane.html (working copy) @@ -49,12 +49,12 @@ -
+
- - - - + + + + @@ -90,12 +90,12 @@ - +
- + Index: tool/src/webapp/templates/PagePicker.html =================================================================== --- tool/src/webapp/templates/PagePicker.html (revision 123346) +++ tool/src/webapp/templates/PagePicker.html (working copy) @@ -30,13 +30,16 @@

-
-
    -
  • -

    +
      +
    • +

      + + + +
    Index: tool/src/webapp/templates/Comments.html =================================================================== --- tool/src/webapp/templates/Comments.html (revision 123346) +++ tool/src/webapp/templates/Comments.html (working copy) @@ -22,13 +22,15 @@

    + +
    - + - - + +

    Index: tool/src/webapp/templates/QuizPicker.html =================================================================== --- tool/src/webapp/templates/QuizPicker.html (revision 123346) +++ tool/src/webapp/templates/QuizPicker.html (working copy) @@ -25,15 +25,15 @@

    -
    +
    -

    +

    - +
    @@ -42,10 +42,11 @@
    +

    + + +

    - - -
    Index: tool/src/webapp/templates/ShowItem.html =================================================================== --- tool/src/webapp/templates/ShowItem.html (revision 123346) +++ tool/src/webapp/templates/ShowItem.html (working copy) @@ -91,11 +91,21 @@
    - +