Index: lams_admin/build.xml =================================================================== diff -u -ra69ba7090220097020872f51e79d2bb87e2dbd84 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_admin/build.xml (.../build.xml) (revision a69ba7090220097020872f51e79d2bb87e2dbd84) +++ lams_admin/build.xml (.../build.xml) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -189,6 +189,15 @@ + + + + + + + + + Index: lams_admin/web/WEB-INF/lams.tld =================================================================== diff -u -rfc1eae65cfee0ee25eedff87f9934dbb187041bd -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_admin/web/WEB-INF/lams.tld (.../lams.tld) (revision fc1eae65cfee0ee25eedff87f9934dbb187041bd) +++ lams_admin/web/WEB-INF/lams.tld (.../lams.tld) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -179,7 +179,15 @@ true + + Output stylesheet based on the user preferences. + style + false + true + + + Index: lams_admin/web/WEB-INF/tags/Tab.tag =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_admin/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_admin/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -1,32 +1,32 @@ <%/**************************************************************** -* Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) -* ============================================================= -* License Information: http://lamsfoundation.org/licensing/lams/2.0/ -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2.0 -* as published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -* USA -* -* http://www.gnu.org/licenses/gpl.txt -* **************************************************************** -*/ + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ /** -* Tab.tag -* Author: Mitchell Seaton -* Description: Creates a tab element. -* Wiki: -*/ + * Tab.tag + * Author: Mitchell Seaton + * Description: Creates a tab element. + * Wiki: + */ %> <%@ tag body-content="empty"%> Index: lams_admin/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_admin/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_admin/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -44,7 +44,8 @@ - + + Index: lams_admin/web/WEB-INF/web.xml =================================================================== diff -u -r22e9389aaada5dc91833d762a79f8051bca172c4 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 22e9389aaada5dc91833d762a79f8051bca172c4) +++ lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -15,6 +15,7 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml @@ -120,13 +121,19 @@ --> - - Index: lams_admin/web/error.jsp =================================================================== diff -u -r88acb04987abd12bc87754fbbe1f835dcd99a5cc -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_admin/web/error.jsp (.../error.jsp) (revision 88acb04987abd12bc87754fbbe1f835dcd99a5cc) +++ lams_admin/web/error.jsp (.../error.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -51,7 +51,7 @@ <% } %> - +
Index: lams_admin/web/template.jsp =================================================================== diff -u -rfd9cc401a2d87e8f588322d52bb93496295cbf85 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_admin/web/template.jsp (.../template.jsp) (revision fd9cc401a2d87e8f588322d52bb93496295cbf85) +++ lams_admin/web/template.jsp (.../template.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -14,12 +14,12 @@ - + - +
Index: lams_central/build.xml =================================================================== diff -u -r24be011190dfeb262da94398fcfd60565ca259e7 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/build.xml (.../build.xml) (revision 24be011190dfeb262da94398fcfd60565ca259e7) +++ lams_central/build.xml (.../build.xml) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -115,7 +115,6 @@ - Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java (.../CssTag.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java (.../CssTag.java) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -54,7 +54,10 @@ private static final Logger log = Logger.getLogger(CssTag.class); private static final String IE_STYLESHEET_NAME = "ie-styles"; private String localLinkPath = null; + private String style = null; + private static final String LEARNER_STYLE = "learner"; // expandable + private static final String TABBED_STYLE = "tabbed"; // fixed width /** * */ @@ -80,6 +83,7 @@ { String theme = (String)i.next(); if ( theme != null) { + theme = appendStyle(theme); if (localLinkPath != null) customStylesheetLink = generateLocalLink(theme); else @@ -117,6 +121,14 @@ return ""; } } + + private String appendStyle(String stylesheetName) { + String ssName = stylesheetName; + if ( ssName != null && ( getStyle() == null || getStyle().equals(LEARNER_STYLE)) ) { + ssName = ssName + "_" + "learner"; + } + return ssName; + } private String generateLocalURL(String stylesheetName) { if ( localLinkPath.endsWith("/") ) { @@ -164,5 +176,24 @@ this.localLinkPath = localLinkPath; } + /** + * @jsp.attribute required="false" rtexprvalue="true" + * description="Learner pages use learner, fancy pages such as index page use core" + * + * Sets whether to use blah.css (style="core") or blah_learner.css (style=learner). + * If this parameter is left blank, you get blah_learner.css e.g. default_learner.css + * @return Returns style. + */ + public String getStyle() + { + return style; + } + public void setStyle(String style) + { + this.style = style; + } + + + } Index: lams_central/web/WEB-INF/lams.tld =================================================================== diff -u -ra915c57124641b38a65fa9d8489ef46c70dcbf78 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision a915c57124641b38a65fa9d8489ef46c70dcbf78) +++ lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -13,6 +13,26 @@ + Converts role name into form usable as message resources key + Converts role name into form usable as message resources key + + + role + org.lamsfoundation.lams.web.tag.RoleTag + empty + + + Converts role name into form usable as message resources key + role + true + + true + + + + + + Output the Server URL as defined in the lams.xml configuration file. LAMS URL @@ -159,7 +179,15 @@ true + + Output stylesheet based on the user preferences. + style + false + true + + + @@ -381,6 +409,6 @@ DefineLater /WEB-INF/tags/DefineLater.tag - + Index: lams_central/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r377a1a547dae390df3b37784e2be3d191b094d8d -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 377a1a547dae390df3b37784e2be3d191b094d8d) +++ lams_central/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -149,7 +149,12 @@ validate="false" > + @@ -236,6 +241,11 @@ redirect="false" /> + - + + Index: lams_central/web/WEB-INF/web.xml =================================================================== diff -u -rf9064d89a3e65435bddfceeeffabd417d72265de -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/WEB-INF/web.xml (.../web.xml) (revision f9064d89a3e65435bddfceeeffabd417d72265de) +++ lams_central/web/WEB-INF/web.xml (.../web.xml) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -13,8 +13,10 @@ classpath:/org/lamsfoundation/lams/toolApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml + classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml classpath:/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml classpath:/org/lamsfoundation/lams/web/webApplicationContext.xml + classpath:/org/lamsfoundation/lams/integrationContext.xml classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml @@ -89,10 +91,20 @@ hibernateFilter /servlet/* + + hibernateFilter + /services/* + + hibernateFilter /fckeditor/* + + + hibernateFilter + /LoginRequest + LocaleFilter *.do @@ -122,13 +134,20 @@ org.springframework.web.context.ContextLoaderListener - + + - org.lamsfoundation.lams.web.SessionListener - + org.lamsfoundation.lams.web.SessionListener + + + + org.apache.axis.transport.http.AxisHTTPSessionListener + + + storeLD org.lamsfoundation.lams.authoring.web.StoreLDServlet @@ -257,19 +276,27 @@ AxisServlet Apache-Axis Servlet - org.apache.axis2.transport.http.AxisServlet + org.apache.axis.transport.http.AxisServlet - 2 - AxisRESTServlet - Apache-Axis Servlet (REST) + AdminServlet + Axis Admin Servlet - org.apache.axis2.transport.http.AxisRESTServlet + org.apache.axis.transport.http.AdminServlet + 100 + + LoginRequest + LoginRequest Servlet For Integration + + org.lamsfoundation.lams.web.LoginRequestServlet + + + action *.do @@ -281,11 +308,6 @@ - AxisRESTServlet - /rest/* - - - AxisServlet /servlet/AxisServlet @@ -300,6 +322,11 @@ /services/* + + LoginRequest + /LoginRequest + + storeLD /servlet/authoring/storeLearningDesignDetails @@ -333,13 +360,21 @@ 120 - + + wsdl + text/xml + + + xsd + text/xml + + 500 /error.jsp @@ -424,7 +459,7 @@ Secure Content *.jsp *.html - /index.jsp + *.do /servlet/* /fckeditor/* Index: lams_central/web/addLesson.jsp =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/addLesson.jsp (.../addLesson.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -11,7 +11,7 @@ - +

Index: lams_central/web/admin.jsp =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/admin.jsp (.../admin.jsp) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/admin.jsp (.../admin.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -10,20 +10,15 @@ - -
+ -
-
- -
+

- Index: lams_central/web/author.jsp =================================================================== diff -u -rf13a83ab0b734b566a297559e47ac3c3e905d4ec -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/author.jsp (.../author.jsp) (revision f13a83ab0b734b566a297559e47ac3c3e905d4ec) +++ lams_central/web/author.jsp (.../author.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -178,13 +178,13 @@ } } -window.onbeforeunload = myOnBeforeUnload; +// window.onbeforeunload = myOnBeforeUnload; //--> Author :: LAMS - + ?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=&country=&langDate=<%=languageDate%>&theme=&uniqueID= lams_preloader.swf Index: lams_central/web/authoringConfirm.jsp =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/authoringConfirm.jsp (.../authoringConfirm.jsp) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/authoringConfirm.jsp (.../authoringConfirm.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -5,7 +5,7 @@ - + - - - - - - - - -
-

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

+

+ + + + + +

+
+
+
Index: lams_central/web/copyright.jsp =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/copyright.jsp (.../copyright.jsp) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/copyright.jsp (.../copyright.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -9,9 +9,9 @@ <fmt:message key="title.lams"/> - + - +

Fisheye: Tag ca73a51b45e6071a6a9edd5da8b0d61bf3a39929 refers to a dead (removed) revision in file `lams_central/web/css/aqua.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ca73a51b45e6071a6a9edd5da8b0d61bf3a39929 refers to a dead (removed) revision in file `lams_central/web/css/base.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ca73a51b45e6071a6a9edd5da8b0d61bf3a39929 refers to a dead (removed) revision in file `lams_central/web/css/default.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/css/defaultHTML.css =================================================================== diff -u --- lams_central/web/css/defaultHTML.css (revision 0) +++ lams_central/web/css/defaultHTML.css (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -0,0 +1,1100 @@ +/* +************************************************* +LAMS 2.0 +CVS ID $id$ + +************************************************* +General page styles +********************************************** */ + +* { + margin: 0px; + padding: 0px; +} + +body { + background-color:#fff; + line-height:16px; + font-size: 11px; + font-family: verdana, arial, helvetica, sans-serif; +} + +body.stripes { + background: url('../images/css/diagonal_bg.gif'); +} + +.row { + voice-family: "\"}\""; /* hide the following rules from IE5 */ + voice-family: inherit; + overflow: hidden; /* CSS 'clearing hack' - works on all except for IE5, that's why the IE5 box model hack above */ +} + +* html .row { + height: 1%; +} /* part of the CSS 'clearing hack' */ + + +h1 { + color:#0087e5; + font-size:15px; + margin-bottom:0px; + margin-left:10px; + padding-top:5px; } + + +/*when there are no tabs at the top of the page */ +h1.no-tabs-below { + color:#0087e5; + font-size:16px; + margin-bottom:0px; + margin-left:10px; + padding-top:25px; } + +h2 {color:#47bc23; + font-size:14px; + margin-left:10px; + margin-bottom:0px; + margin-top:10px; } + + +h4 {color:#47bc23; font-size:11px;} + +/*defines when instructions are given and places a blue arrow before the text */ +p.instructions { + color: #0087e5; + margin-bottom: 0px; + margin-top: 0px;; + margin-left: 30px; + font-weight: bold; + background: url('../images/css/blue_arrow_right.gif') no-repeat 0 0px; + padding-left: 30px; + padding-bottom: 10px; + font-size: 12px +} + +p { + margin-left: 25px; + margin-right: 30px; + margin-bottom: 18px; +} + +ul { + margin-left: 25px; + margin-right: 30px; +} + +#page { /*whole layout of page*/ + margin: 25px auto; + width: 707px; + background: url('../images/css/lams_logo.gif') no-repeat right 10px; +} + +#header { /*layout of the header */ + width: 707px; + height: 49px; + background: url('../images/css/top_bg.jpg') no-repeat bottom; +} + +#header-no-tabs { /*layout of the header when no-tabs are required. Big enough to line up with LAMS icon - don't use for learner (see header-no-tabs-learner) */ +width:707px; height:40px; background:url('../images/css/top_bg.jpg') no-repeat bottom; } + + + + + +/* +************************************************* + +Layout of tab navigation section + +********************************************** */ +#nav { /* layout of box that contains the main navigation */ + margin-top: 15px; + width: auto; + height: 40px; + margin-left: 4px; + +} + +#nav a { + color: #0087e5; + text-decoration: none; + font-size: 12px; + font-weight: bold; +} + +#nav a:hover { + color: #006bb6; + text-decoration: none; +} + +#nav a.selected { + color: #333; +} + + + + +/* +************************************************* + +Tab navigation styles + +********************************************** */ +.nav-box { /* layout of containers that surround the tab navigation */ + height: 31px; + width: auto; + margin-right: 2px; + float: left; + text-align: center; +} + +.tab-left-selected { /* defines left side of selected tab */ + height: 31px; + width: 8px; + background: url('../images/css/selected_left.jpg') no-repeat top left; + float: left +} + +.tab-middle-selected { /* defines middle of selected tab */ + height: 31px; + width: 90px; + background: url('../images/css/selected_bg.jpg') repeat-x; + float: left; + padding:8px 5px 0px 5px; +} + +#nav .tab-middle-link-selected { + color: #333333 +} + +.tab-right-selected { /* defines right side of selected tab */ + height: 31px; + width: 8px; + background: url('../images/css/selected_right.jpg') no-repeat top right;; + float: left +} + +.tab-left { /* defines left side of selected tab */ + height: 31px; + width: 8px; + background: url('../images/css/button_left.jpg') no-repeat top left; + float: left +} + +.tab-middle { /* defines middle of selected tab */ + height: 31px; + width: 90px; + background: url('../images/css/button_bg.jpg') repeat-x; + float: left; + + padding:8px 5px 0px 5px; +} + +#nav .tab-middle-link { + color: #0087e5 +} + +.tab-right { /* defines right side of selected tab */ + height: 31px; + width: 8px; + background: url('../images/css/button_right.jpg') no-repeat top right;; + float: left +} + + + + +/* +************************************************* + +Layout of main content section + +********************************************** */ +#content { /*box around the main content area */ + width: 707px; + background: url('../images/css/body_bg.jpg') repeat-y; + padding-bottom: 20px; + font-size: 11px; + margin-top: -5px + +} + +/*layout of Links within the content area */ +#content a { + color: #47bc23; + text-decoration: none; + border-bottom: 1px dotted #47bc23; +} + +#content a:hover { + color: #47bc23; + text-decoration: none; + border-bottom: 1px solid #47bc23; +} + +/*layout of a general button*/ +#content a.button { + background: url('../images/css/btn_off.gif') repeat-x 0px 0px; + color: #333; + border: 0px none; + padding:5px 20px 6px 20px; + text-decoration: none; +} + +/* style to disbable input buttons */ +#content a.button .disabled { + color: #999; + background: url('../images/css/btn_off.gif') no-repeat 0px 20px; + border: 0px none; + padding:25px 20px; + } + +#content a:hover.button { + background: url('../images/css/btn_over.gif') repeat-x 0px 0px; + color: #349018; + border: 0px none; + padding:5px 20px 6px 20px; + text-decoration: none; +} + +/*layout of a general button*/ +a.button { + background: url('../images/css/btn_off.gif') repeat-x 0px 0px; + color: #333; + border: 0px none; + padding:5px 20px; + text-decoration: none; +} + +a:hover.button { + background: url('../images/css/btn_over.gif') repeat-x 0px 0px; + color: #349018; + border: 0px none; + padding:5px 20px; + text-decoration: none; +} + + +/*layout of adding a topic button */ +a.button-add-item { + background: url('../images/css/btn_add_off.gif') no-repeat 0px 20px; + color: #333; + border: 0px none; + padding:25px 15px 25px 25px; + text-decoration: none; +} + +a:hover.button-add-item { + background: url('../images/css/btn_add_over.gif') no-repeat 0px 20px; + color: #349018; + border: 0px none; + padding:25px 15px 25px 25px; + text-decoration: none; +} + + +/*layout of adding a topic button */ +#content a.button-add-item { + background: url('../images/css/btn_add_off.gif') no-repeat 0px 20px; + color: #333; + border: 0px none; + padding:25px 15px 25px 25px; +} + +#content a:hover.button-add-item { + background: url('../images/css/btn_add_over.gif') no-repeat 0px 20px; + color: #349018; + border: 0px none; + padding:25px 15px 25px 25px; +} + +/*layout of html editor button */ +#content a.button-html-editor { + background: url('../images/css/btn_htmled_off.gif') no-repeat 0px 20px; + color: #666; + border: 0px none; + padding:25px 15px 25px 28px; +} + +#content a:hover.button-html-editor { + background: url('../images/css/btn_htmled_off.gif') no-repeat 0px 20px; + color: #333; + border: 0px none; + padding:25px 15px 25px 28px; +} + +/************ The sequence name box **********/ +.sequence-name { + margin-top:5px; + margin-left:30px; + +} + +.sequence-name p{ + margin:0px; + +} + + +#content a.sequence-name-link { + color:#0087E5; + text-decoration: none; + border-bottom: 1px dotted #0087E5; + } + + +#content a:hover.sequence-name-link { + color:#0087E5; + text-decoration: none; + border-bottom: 1px solid #0087E5; + +} + +#content a.sequence-action-link { + color:#47bc23; + text-decoration: none; + border:0px; + font-variant:small-caps; + margin-left:20px; +} + +#content a:hover.sequence-action-link { + color:#47bc23; + text-decoration: none; + border-bottom:0px; + font-variant:small-caps; + margin-left:20px; + } + +/* my courses individual course boxes */ + +.course-bg { /*---- box around the green tabbed items -- */ + margin-top:15px; + margin-bottom:20px; + width:100%; + background:#fff url('../images/css/mycourses_greentab.jpg') no-repeat top; + margin-left:0px; + +} + +.course-bg h2 { + font-size:13px; + color:#47bc23; + padding-left:0px; + margin-top:12px; + margin-left:0px; +} + +.course-bg h4 { + font-size:12px; + color:#47bc23; + padding-left:0px +} + +.course-buttons { + margin-right:0px; +} + + +/* Hovering submit button */ +input.button { + background: url('../images/css/btn_off.gif') no-repeat 0px 20px; + color: #333; + border: 0px none; + padding:25px 20px; + text-decoration: none; + font-size: 11px; + font-family: verdana, arial, helvetica, sans-serif; +} + +input:hover.button { + background: url('../images/css/btn_over.gif') no-repeat 0px 20px; + color: #349018; + border: 0px none; + padding:25px 20px; + text-decoration: none; + font-size: 11px; + font-family: verdana, arial, helvetica, sans-serif; +} +.box { + display: none; + min-height: 100px; +} + +#footer { /*layout of the footer - the bottom of the box */ + width: 707px; + height: 14px; + background: url('../images/css/footer_bg.jpg') no-repeat bottom; +} + +/*layout of the table with the alternate color for the table heading cell */ +table.alternative-color { + width:98%; + margin-left:7px; + padding-top:20px; + margin-bottom:30px; + text-align:left; +} + +table.alternative-color th { + background: url('../images/css/green_bg.jpg') repeat-x; + height: 30px; + color: #47bc23; + padding-left: 15px; + border-left: 1px solid #cacdd1; + border-right: 1px solid #fff; + font-size: 12px; +} + +table.alternative-color td { + padding-left: 20px; + font-size: 11px; + border-bottom: 1px solid #efefef; + vertical-align: middle; + background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 1px +} + +table.alternative-color td.first, table.alternative-color th.first { + border-left: none; + padding-left: 20px; +} + + +/*layout of the forum tables with the colored table heading cell */ +table.forum { + width:98%; + margin-left:7px; + padding-top:5px; + margin-bottom:10px; + background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 49px; + text-align:left; + border-bottom:1px solid #efefef;} + +table.forum th { + background: url('../images/css/forum_th_bg.jpg') repeat-x #f0f5df; + height:20px; + padding-top:5px; + color:#47bc23; + padding-left:15px; + border-left:1px solid #cacdd1; + font-size:12px; + vertical-align:middle; +} + +table.forum td.posted-by { + background: url('../images/css/forum_postedby_bg.jpg') repeat-x; + height:20px; + padding-left:20px; + padding-top:0px; + font-size:10px; + vertical-align:top; +} + + +table.forum td { + padding-left:20px; + font-size:11px; + vertical-align:top; +} +table.forum td.first, table.forum th.first { + border-left:none; + padding-left:20px; +} + +/* Used for chosen grouping */ +table.chosengrouping { + width:98%; + margin-left:0px; + text-align:center; + } + +table.chosengrouping tr { + vertical-align:top +} + +table.chosengrouping th { + padding:0px; + font-size:11px; + text-align:center; +} + +table.chosengrouping td { + padding:0px; + font-size:11px; + text-align:center; +} + +table.chosengrouping td p{ + padding:0px; + font-size:11px; + line-height:11px; +} + +table.chosengrouping td select { + font-size:11px; +} +/*layout of the table with form elements */ + +table { + width:98%; + margin-left:7px; + text-align:left; + } + +td { + padding:10px; + font-size:12px; +} + +td p{ + padding:10px; + font-size:12px; + line-height:18px; +} + +/*layout of button in table */ +td p.button{ + margin:0px; + padding:10px 10px 10px 0px; + font-size:11px; + font-family: verdana, arial, helvetica, sans-serif; +} + + + +/* */ /*layout of form styles */ +.field-name { + color: #0087e5; + font-weight: bold; + text-align: right; +} + +.field-name-alternative-color { + color: #47bc23; + font-weight: bold; + text-align: right; +} + +input { + border: 1px solid #c1c1c1; + padding: 2px; +} + +textarea { + border: 1px solid #c1c1c1; + padding: 2px; +} + +.noBorder { + border: none; +} + +/*misc styles*/ +.space-right { + margin-right: 10px; +} + +.space-left { + margin-left: 10px; +} + +.space-bottom { + margin-bottom: 40px; +} + +hr { + border:0px; + border-top:1px solid #ccc; + width: 650px; + height: 1px; + margin-15px 25px 10px 25px; + } + +/* Warning message style */ +.warning { + color: #cc0000; + padding:25px 10px 10px 35px; + margin-top: 25px; + margin-left: 15px; + text-align: left; + font-weight: normal; + background: url('../images/css/warning.gif') no-repeat #ffeae0 10px 8px; + width: 70%; + border: 1px solid #E82A28; +} + +.warning-login { + color: #cc0000; + padding:5px 5px; + padding-left: 35px; + padding-bottom: -10px; + margin-top: -5px; + margin-bottom: -10px; + margin-left: 15px; + text-align: left; + font-weight: normal; + background: url('../images/css/warning.gif') no-repeat #ffeae0 10px 8px; + width: 70%; + border: 1px solid #E82A28; +} + + +/* +************************************************* + +Login page styles + +********************************************** */ + + +#login-page { /*whole layout of login page*/ +margin:0px auto; +width:707px; +} + +/*layout of the header when no-tabs are required */ +#login-header { +width:707px; +height:25px; +background:url('../images/css/top_bg.jpg') no-repeat bottom; +} + + /*box around the main content area */ +#login-content { +width:707px; +background:url('../images/css/body_bg.jpg') repeat-y; +padding-bottom:20px; +font-size: 11px; +margin-top:-5px; +line-height:18px; +} + +#login-left-col { +width:330px; +float:left; +padding-left:40px; +margin-top:15px; +} + +#login-left-col a { + color:#47bc23; + text-decoration: underline; +}n + +#login-left-col h1 { +margin:0px; +padding:0px; +} + +#login-left-col h2 { +margin:30px 0px 0px 3px; +padding:0px; +font-weight:100; +font-size:1.5em; +} + +#login-left-col h3 { +color:#239CF7; +font-size:11px; +margin:0px; +} + +#login-left-col ul { +list-style-type:none; +margin-top:0px; +margin-left:4px; +} + +#login-left-col li { +padding:10px 0px 15px 0px; +border-bottom: +1px dotted #ccc; +} + +#login-right-col { +width:285px; +float:left; +margin-left:47px; +background: url('../images/css/lams_login_bar.jpg') no-repeat 0 0; +margin-top:5px; +height:450px; +} + +#login-right-col h2 { +margin-top:22px; +margin-left:20px; +color:#239CF7; +margin-bottom: 30px; +} + +#login-right-col p { +margin-top:5px; +margin-right:50px; +text-align:right; +} +#login-right-col p.first { +margin-top:25px; +margin-right:50px; +text-align:right; +margin-bottom:15px; +} + +#login-right-col p.version { +color:#47bc23; +margin-top:5px; +margin-right:20px; +margin-bottom:0px; +text-align:right; +font-size:1.2em; +} +#login-right-col p.login-button{ +margin-top:-23px; +margin-right:50px; +text-align:right; +} +#login-right-col a.button { +background:url('../images/css/btn_off.gif') no-repeat 0px 20px; +color:#333; +border:0px none; +padding:25px 20px; +text-decoration:none; } + +#login-right-col a:hover.button { +background:url('../images/css/btn_over.gif') no-repeat 0px 20px; +color:#349018; +border:0px none; +padding:25px 20px; +text-decoration:none;} + +#login-page #footer { /*layout of the footer - the bottom of the box */ + width: 707px; + height: 14px; + background: url('../images/css/footer_bg.jpg') no-repeat top; +} + +#login-page #footer p{ + padding:20px 0px 0px 10px; + text-align:center; + font-family: verdana, arial, helvetica, sans-serif; + font-size:.9em; + color:#999; +} + +.clear { +clear:both +} + + + +/* +************************************************* + +Learner Pages + +********************************************** */ +#page-learner { /*whole layout of page*/ +margin:0px auto; +width:592px; +} + +#header-no-tabs-learner { /*layout of the header when no-tabs are required */ +width:592px; +height:30px; +background:url('../images/css/top_bg_learner.jpg') no-repeat bottom; +} + +#content-learner { /*box around the main content area */ +width:592px; +background:url('../images/css/body_bg_learner.jpg') repeat-y; +padding-bottom:30px; +font-size: 11px; +margin-top:-20px} + +#footer-learner { /*layout of the footer - the bottom of the box */ +width:592px; +height:14px; +background:url('../images/css/footer_bg_learner.jpg') no-repeat bottom; +} + +/*layout of a general button*/ +#content-learner a.button { +background:url('../images/css/btn_off.gif') no-repeat 0px 20px; +color:#333; +border:0px none; +padding:25px 20px; +text-decoration:none; +} +#content-learner a:hover.button { +background:url('../images/css/btn_over.gif') no-repeat 0px 20px; +color:#349018; +border:0px none; +padding:25px 20px; +text-decoration:none; +} + +/*layout of adding a topic button */ +#content-learner a.button-add-item { +background:url('../images/css/btn_add_off.gif') no-repeat 0px 20px; +color:#333; +border:0px none; +padding:25px 15px 25px 25px; +text-decoration:none; +} +#content-learner a:hover.button-add-item { +background:url('../images/css/btn_add_over.gif') no-repeat 0px 20px; +color:#349018; +border:0px none; +padding:25px 15px 25px 25px; +text-decoration:none; +} + + + + +/* +************************************************* + +Floating button containers + +********************************************** */ + +.left-buttons {float:left; padding-left:20px;} + +.right-buttons {float:right; padding-right:20px;} + + + +/* +************************************************* + +My Courses Pages +********************************************** */ + +/* welcome user box */ + + +.welcome {margin-bottom:35px; margin-top:0px; background-color:#33FFFF; margin-left:20px;margin-right:20px;} + +.float-left {float:left;} + +.float-right {float:right;} + + + +/* layout for my-courses pages */ + +.my-courses { + background: url('../images/css/diagonal_bg.gif') repeat; +} + + +#page-mycourses { /*whole layout of page*/ + margin: 25px auto; + width: 707px; + background: url('../images/css/lams_logo.gif') no-repeat 10px -7px; + +} + +#page-mycourses #footer { /*layout of the footer - the bottom of the box */ + width: 707px; + height: 14px; + background: url('../images/css/footer_bg.jpg') no-repeat top; +} + +#page-mycourses #footer p{ + padding:20px 0px 0px 10px; + text-align:center; + font-family: verdana, arial, helvetica, sans-serif; + font-size:.9em; + color:#999; +} + + +#header-my-courses { /*layout of the header */ + width: 707px; + height:65px; + background: url('../images/css/top_bg.jpg') no-repeat bottom; +} + +/* my courses nav */ + +.nav-box-right { + height: 31px; + width: auto; + margin-right: 2px; + margin-top: 16px; + float: right; + text-align: center;} + +#nav-right { /* layout of box that contains the main navigation */ + margin-top:30px; + width: auto; + height: 40px; + margin-right: 1px; +} + +#nav-right a { + color: #0087e5; + text-decoration: none; + font-size: 12px; + font-weight: bold; +} + +#nav-right a:hover { + color: #006bb6; + text-decoration: none; +} + +#nav-right a.selected { + color: #333; +} + + +/* my courses grey buttons in the green bar */ + +.mycourses-right-buttons {float:right; padding-right:20px; margin-top:11px; height:24px; font-size:11px} + +#content a.add-lesson-button { + background: url('../images/css/add_lesson.jpg') no-repeat 0px 0px; + color: #666; + padding: 5px 12px 6px 30px; + text-decoration: none; + border-right:1px solid #d2d2d2; + border-bottom: 0px; + margin-top:6px; + margin-left:5px; +} + +#content a:hover.add-lesson-button { + background: url('../images/css/add_lesson.jpg') no-repeat 0px 0px; + color: #47bc23; + padding: 5px 12px 6px 30px; + text-decoration: none; + margin-top:0px; + margin-left:5px; + border-right:1px solid #d2d2d2; + border-bottom: 0px; +} + +#content a.manage-group-button { + background: url('../images/css/manage_groups.jpg') no-repeat 0px 0px; + color: #666; + padding: 5px 12px 6px 30px; + text-decoration: none; + border-right:1px solid #d2d2d2; + border-bottom: 0px; + margin-top:6px; + margin-left:10px; +} + +#content a:hover.manage-group-button { + background: url('../images/css/manage_groups.jpg') no-repeat 0px 0px; + color: #47bc23; + padding: 5px 12px 6px 30px; + text-decoration: none; + margin-top:0px; + margin-left:10px; + border-right:1px solid #d2d2d2; + border-bottom: 0px; +} + +/* my courses individual course boxes */ + +.course-bg { /*---- box around the green tabbed items -- */ + margin-top:15px; + margin-bottom:20px; + width:100%; + background:#fff url('../images/css/mycourses_greentab.jpg') no-repeat top; + margin-left:0px; + +} + +.course-bg h2 { + font-size:13px; + color:#47bc23; + padding-left:0px; + margin-top:12px; + margin-left:0px; +} + +.course-bg h4 { + font-size:12px; + color:#47bc23; + padding-left:0px +} + +.course-buttons { + margin-right:0px; +} + +/************ The sequence name box **********/ +.sequence-name { + margin-top:5px; + margin-left:30px; + +} + +.sequence-name p{ + margin:0px; + +} + + +#content a.sequence-name-link { + color:#0087E5; + text-decoration: none; + border-bottom: 1px dotted #0087E5; + } + + +#content a:hover.sequence-name-link { + color:#0087E5; + text-decoration: none; + border-bottom: 1px solid #0087E5; + +} + +#content a.sequence-action-link { + color:#47bc23; + text-decoration: none; + border:0px; + font-variant:small-caps; + margin-left:20px; +} + +#content a:hover.sequence-action-link { + color:#47bc23; + text-decoration: none; + border-bottom:0px; + font-variant:small-caps; + margin-left:20px; + } + + +/************ The group name box **********/ + +.group-name { +margin-top:5px; +margin-left:80px; +} + +.group-name p { +padding-top:0px; +margin-bottom:0px; +padding-left:0px; +margin-left:0px; +} + +.group-name strong { +color: #666; +} + +/*aligns the image in the middle of the line - gives padding */ +.align-middle{ +vertical-align:middle; +padding-right:0px; +border:0px; +} + +.small-space-top {margin-top:6px;} \ No newline at end of file Index: lams_central/web/css/defaultHTML_learner.css =================================================================== diff -u --- lams_central/web/css/defaultHTML_learner.css (revision 0) +++ lams_central/web/css/defaultHTML_learner.css (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -0,0 +1,355 @@ +/* +************************************************* +LAMS 2.0 +Date modified: 22/09/2006 + +************************************************* +General page styles +********************************************** */ + +* { + margin:0; + padding:0; +} + +body { + font-size: 11px; + font-family: verdana, arial, helvetica, sans-serif; + line-height:16px; + background:url('../images/css/diagonal_bg.gif') repeat; +} + +.row { + voice-family: "\"}\""; /* hide the following rules from IE5 */ + voice-family: inherit; + overflow: hidden; /* CSS 'clearing hack' - works on all except for IE5, that's why the IE5 box model hack above */ +} + +* html .row { + height: 1%; +} /* part of the CSS 'clearing hack' */ + + +h1 {color:#0087e5; + font-size:15px; + margin-bottom:5px; + } + +h2 {color:#47bc23; + font-size:14px; + padding-top:10px; + margin-bottom:5px; } + + +h3 {color:#47bc23; + font-size:13px; + margin-top:10px; + margin-bottom:5px; } + + +h4 {color:#47bc23; + font-size:12px; + margin-left:25px; + padding-top:20px; + } + +/*defines when instructions are given and places a blue arrow before the text */ +p.instructions { + color: #0087e5; + margin-bottom:0; + margin-top:0; + background: url('../images/css/blue_arrow_right.gif') no-repeat 0 0px; + padding-left: 30px; + padding-bottom: 10px; + font-size:13px; +} + +p { + margin-right: 30px; + margin-bottom: 10px; + margin-top:5px; +} + +ul { + margin-left: 25px; + margin-right: 30px; +} + +/*layout of the table with the alternate color for the table heading cell */ +table.alternative-color { + width:95%; + margin-right:25px; + margin-bottom:10px; + text-align:left; +} + +table.alternative-color th { + background: url('../images/css/green_bg.jpg') repeat-x; + height: 30px; + color: #47bc23; + padding-left: 15px; + border-left: 1px solid #cacdd1; + border-right: 1px solid #fff; + font-size: 12px; +} + +table.alternative-color td { + padding-left: 20px; + font-size: 11px; + border-bottom: 1px solid #efefef; + vertical-align: middle; + background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 1px; +} + +table.alternative-color td.first, table.alternative-color th.first { + border-left: none; + padding-left: 10px; +} + +table.alternative-color td h4{ + color:#47bc23; + font-size:12px; + margin-top:0px; + padding-top:10px; + padding-bottom:10px; + } + +/*layout of an inserted image */ +.image-border { + border:1px solid #e2e2e2; + padding:3px; + background-color:#fff; + margin:5px 10px; +} + +/*layout of the table with form elements */ + +table { + width:98%; + margin-left:7px; + text-align:left; + } + +td { + padding:10px; + font-size:12px; +} + +td p{ + padding:10px; + font-size:12px; + line-height:18px; +} + +/*layout of button in table */ +td p.button{ + margin:0px; + padding:10px 10px 10px 0px; + font-size:11px; + font-family: verdana, arial, helvetica, sans-serif; +} + +/* */ /*layout of form styles */ +.field-name { + color: #0087e5; + font-weight: bold; + text-align: right; +} + +.field-name-alternative-color { + color: #47bc23; + font-weight: bold; + text-align: right; +} + +input { + border: 1px solid #c1c1c1; + padding: 2px; +} + +textarea { + border: 1px solid #c1c1c1; + padding: 2px; +} + +.noBorder { + border: none; +} + +/*misc styles*/ +.space-right { + margin-right: 10px; +} + +.space-left { + margin-left: 10px; +} + +.space-bottom { + margin-bottom: 40px; +} + +hr { + border:0px; + border-top:1px solid #ccc; + width: 650px; + height: 1px; + margin-15px 25px 10px 25px; + } + +.warning { + color: #cc0000; + padding:25px 10px 10px 35px; + margin-top: 25px; + margin-left: 15px; + text-align: left; + font-weight: normal; + background: url('../images/css/warning.gif') no-repeat #ffeae0 10px 8px; + width: 70%; + border: 1px solid #E82A28; +} + + +/************************************************* +Page layout +********************************************** */ + +#content { + margin-top:20px; + margin-left:auto; + margin-right:auto; + margin-bottom:20px; + width:85%; + height:100%; + border:1px solid #d4d8da; + background-color:#fff; + padding:20px 30px; + } + +#footer { + clear:inherit; + height:20px;} + + +/* +************************************************* + +Buttons + +********************************************** */ + +.left-buttons {float:left; padding-left:20px;} + +.right-buttons {float:right; padding-right:20px;} + +/*layout of a general button*/ +#content a.button { + background: url('../images/css/btn_off.gif') repeat-x 0px 0px; + color: #333; + border: 0px none; + padding:5px 20px 6px 20px; + text-decoration: none; +} + +/* style to disbable input buttons */ +#content a.button .disabled { + color: #999; + background: url('../images/css/btn_off.gif') no-repeat 0px 20px; + border: 0px none; + padding:25px 20px; + } + +#content a:hover.button { + background: url('../images/css/btn_over.gif') repeat-x 0px 0px; + color: #349018; + border: 0px none; + padding:5px 20px 6px 20px; + text-decoration: none; +} + +/*layout of a general button*/ +a.button { + background: url('../images/css/btn_off.gif') repeat-x 0px 0px; + color: #333; + border: 0px none; + padding:5px 20px; + text-decoration: none; +} + +a:hover.button { + background: url('../images/css/btn_over.gif') repeat-x 0px 0px; + color: #349018; + border: 0px none; + padding:5px 20px; + text-decoration: none; +} + + +/*layout of adding a topic button */ +a.button-add-item { + background: url('../images/css/btn_add_off.gif') no-repeat 0px 20px; + color: #333; + border: 0px none; + padding:25px 15px 25px 25px; + text-decoration: none; +} + +a:hover.button-add-item { + background: url('../images/css/btn_add_over.gif') no-repeat 0px 20px; + color: #349018; + border: 0px none; + padding:25px 15px 25px 25px; + text-decoration: none; +} + + +/*layout of adding a topic button */ +#content a.button-add-item { + background: url('../images/css/btn_add_off.gif') no-repeat 0px 20px; + color: #333; + border: 0px none; + padding:25px 15px 25px 25px; +} + +#content a:hover.button-add-item { + background: url('../images/css/btn_add_over.gif') no-repeat 0px 20px; + color: #349018; + border: 0px none; + padding:25px 15px 25px 25px; +} + +/*layout of html editor button */ +#content a.button-html-editor { + background: url('../images/css/btn_htmled_off.gif') no-repeat 0px 20px; + color: #666; + border: 0px none; + padding:25px 15px 25px 28px; +} + +#content a:hover.button-html-editor { + background: url('../images/css/btn_htmled_off.gif') no-repeat 0px 20px; + color: #333; + border: 0px none; + padding:25px 15px 25px 28px; +} + +/* Hovering submit button */ +input.button { + background: url('../images/css/btn_off.gif') no-repeat 0px 20px; + color: #333; + border: 0px none; + padding:25px 20px; + text-decoration: none; + font-size: 11px; + font-family: verdana, arial, helvetica, sans-serif; +} + +input:hover.button { + background: url('../images/css/btn_over.gif') no-repeat 0px 20px; + color: #349018; + border: 0px none; + padding:25px 20px; + text-decoration: none; + font-size: 11px; + font-family: verdana, arial, helvetica, sans-serif; +} \ No newline at end of file Fisheye: Tag ca73a51b45e6071a6a9edd5da8b0d61bf3a39929 refers to a dead (removed) revision in file `lams_central/web/css/default_learner.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ca73a51b45e6071a6a9edd5da8b0d61bf3a39929 refers to a dead (removed) revision in file `lams_central/web/css/xp.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/development/wddxPost.jsp =================================================================== diff -u -r377a1a547dae390df3b37784e2be3d191b094d8d -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/development/wddxPost.jsp (.../wddxPost.jsp) (revision 377a1a547dae390df3b37784e2be3d191b094d8d) +++ lams_central/web/development/wddxPost.jsp (.../wddxPost.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -13,18 +13,13 @@ - + -
- -

+

Test WDDX Packet

-
-
- -
+

Test posting file to form - this should be WDDX XML to a URL expecting @@ -46,9 +41,8 @@ for this page is normally commented out and will need to be uncommented. Look for WDDXPost.

- Index: lams_central/web/errorpages/403.jsp =================================================================== diff -u -r251602060b94d6620be962e589b2fecc8f0176af -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/errorpages/403.jsp (.../403.jsp) (revision 251602060b94d6620be962e589b2fecc8f0176af) +++ lams_central/web/errorpages/403.jsp (.../403.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -16,17 +16,17 @@ - -
+ + -

+

-
+ -
+
<%-- Error Messages --%>

@@ -40,9 +40,8 @@

- + -
- + Index: lams_central/web/errorpages/404.jsp =================================================================== diff -u -rb3604a1b714e3e169fc8c3c87d39e6580d0218fa -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/errorpages/404.jsp (.../404.jsp) (revision b3604a1b714e3e169fc8c3c87d39e6580d0218fa) +++ lams_central/web/errorpages/404.jsp (.../404.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -16,17 +16,17 @@ - -
+ + -

+

-
+ -
+
<%-- Error Messages --%>

@@ -40,9 +40,8 @@

- + -
- + Index: lams_central/web/errorpages/error.jsp =================================================================== diff -u -r251602060b94d6620be962e589b2fecc8f0176af -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/errorpages/error.jsp (.../error.jsp) (revision 251602060b94d6620be962e589b2fecc8f0176af) +++ lams_central/web/errorpages/error.jsp (.../error.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -33,17 +33,17 @@ - -
+ + -

+

-
+ -
+
<%-- Error Messages --%>

@@ -77,9 +77,8 @@

- + -
- + Index: lams_central/web/index.jsp =================================================================== diff -u -r4f23888b7f7ab9234285d6565b5995ed94fee49f -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/index.jsp (.../index.jsp) (revision 4f23888b7f7ab9234285d6565b5995ed94fee49f) +++ lams_central/web/index.jsp (.../index.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -10,19 +10,14 @@ - -
+ -
-
- -
+

- \ No newline at end of file Index: lams_central/web/learner.jsp =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/learner.jsp (.../learner.jsp) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/learner.jsp (.../learner.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -11,20 +11,15 @@ - -
+ -
-
- -
+

- Index: lams_central/web/login.jsp =================================================================== diff -u -r72c98945de1f8b7eebe9e92afa7dc93d15357c10 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/login.jsp (.../login.jsp) (revision 72c98945de1f8b7eebe9e92afa7dc93d15357c10) +++ lams_central/web/login.jsp (.../login.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -28,7 +28,7 @@ - + @@ -42,7 +42,7 @@ - +

 

Index: lams_central/web/main.jsp =================================================================== diff -u -ra78b1d902f24585ceabc325c2d2ae95094bf0052 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/main.jsp (.../main.jsp) (revision a78b1d902f24585ceabc325c2d2ae95094bf0052) +++ lams_central/web/main.jsp (.../main.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -18,7 +18,7 @@ - + Index: lams_central/web/monitorLesson.jsp =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/monitorLesson.jsp (.../monitorLesson.jsp) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/monitorLesson.jsp (.../monitorLesson.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -11,20 +11,15 @@ - -
+ -
-
- -
+

- Index: lams_central/web/sysadmin.jsp =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/sysadmin.jsp (.../sysadmin.jsp) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/sysadmin.jsp (.../sysadmin.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -10,20 +10,15 @@ - -
+ -
-
- -
+

- Index: lams_central/web/template.jsp =================================================================== diff -u -r5e3a1e5f73e433076f00eb9b0a489c54430b5672 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/template.jsp (.../template.jsp) (revision 5e3a1e5f73e433076f00eb9b0a489c54430b5672) +++ lams_central/web/template.jsp (.../template.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -13,7 +13,7 @@ - + @@ -22,7 +22,7 @@ - +
Index: lams_central/web/toolcontent/exportloading.jsp =================================================================== diff -u -ra1c3c6e46c0ccf811d0db5497026956b2ab615f8 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/toolcontent/exportloading.jsp (.../exportloading.jsp) (revision a1c3c6e46c0ccf811d0db5497026956b2ab615f8) +++ lams_central/web/toolcontent/exportloading.jsp (.../exportloading.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -27,27 +27,21 @@ - + -
- -

+

-
-
-
+

- Index: lams_central/web/toolcontent/exportresult.jsp =================================================================== diff -u -ra1c3c6e46c0ccf811d0db5497026956b2ab615f8 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/toolcontent/exportresult.jsp (.../exportresult.jsp) (revision a1c3c6e46c0ccf811d0db5497026956b2ab615f8) +++ lams_central/web/toolcontent/exportresult.jsp (.../exportresult.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -16,16 +16,11 @@ - + -
+

+
-

-
-
- -
- @@ -51,11 +46,9 @@
- - Index: lams_central/web/toolcontent/import.jsp =================================================================== diff -u -r20cd71b3e3a3dd9a8417edc6e62b9aedb8eb7d0b -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision 20cd71b3e3a3dd9a8417edc6e62b9aedb8eb7d0b) +++ lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -17,19 +17,15 @@ - -
+ + -

+

-
-
- - -
+

@@ -51,14 +47,10 @@ - - - - Index: lams_central/web/toolcontent/importresult.jsp =================================================================== diff -u -ra1c3c6e46c0ccf811d0db5497026956b2ab615f8 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_central/web/toolcontent/importresult.jsp (.../importresult.jsp) (revision a1c3c6e46c0ccf811d0db5497026956b2ab615f8) +++ lams_central/web/toolcontent/importresult.jsp (.../importresult.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -16,17 +16,13 @@ - + -
- -

+

-
-
-
+
@@ -56,10 +52,8 @@
- - Index: lams_learning/build.xml =================================================================== diff -u -r83c3e08a1f6ce808347216d966b39fe4304e8299 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_learning/build.xml (.../build.xml) (revision 83c3e08a1f6ce808347216d966b39fe4304e8299) +++ lams_learning/build.xml (.../build.xml) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -249,6 +249,15 @@ + + + + + + + + + Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java (.../CSSBundler.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java (.../CSSBundler.java) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -120,7 +120,10 @@ String url = basePath + "/lams/css/" + theme + ".css"; HttpUrlConnectionUtil.writeResponseToFile(url, outputDirectory, theme + ".css", cookies); //cookies aren't really needed here. - } + + url = basePath + "/lams/css/" + theme + "_learner.css"; + HttpUrlConnectionUtil.writeResponseToFile(url, outputDirectory, theme + "_learner.css", cookies); //cookies aren't really needed here. +} // include the special IE stylesheet String url = basePath + "/lams/css/ie-styles.css"; @@ -161,20 +164,25 @@ while (i.hasNext()) { String theme = (String)i.next(); - addThemeFile(cssDirectory, theme); + + String themeFilename = theme + ".css"; + addThemeFile(cssDirectory, themeFilename); + + themeFilename = theme + "_learner.css"; + addThemeFile(cssDirectory, themeFilename); } // include the special IE stylesheet addThemeFile(cssDirectory, "ie-styles"); } - private void addThemeFile(String cssDirectory, String themeName) { - String theme = themeName + ".css"; - File themeFile = new File(centralPath + "/css/" + theme); + private void addThemeFile(String cssDirectory, String themeFilename) { + File themeFile = new File(centralPath + File.separatorChar + "css" + File.separatorChar + themeFilename); if ( ! themeFile.canRead() ) { log.error("Unable to read theme file "+themeFile.getAbsolutePath()); } else { - filesToCopy.put(cssDirectory+File.separatorChar+theme,themeFile); + filesToCopy.put(cssDirectory+File.separatorChar+themeFilename,themeFile); + } } Index: lams_learning/web/WEB-INF/lams.tld =================================================================== diff -u -r2deb6430189162e43922f84f227edb535b851ca2 -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_learning/web/WEB-INF/lams.tld (.../lams.tld) (revision 2deb6430189162e43922f84f227edb535b851ca2) +++ lams_learning/web/WEB-INF/lams.tld (.../lams.tld) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -13,6 +13,26 @@ + Converts role name into form usable as message resources key + Converts role name into form usable as message resources key + + + role + org.lamsfoundation.lams.web.tag.RoleTag + empty + + + Converts role name into form usable as message resources key + role + true + + true + + + + + + Output the Server URL as defined in the lams.xml configuration file. LAMS URL @@ -64,6 +84,34 @@ + Help tag + Help tag + + + help + org.lamsfoundation.lams.web.tag.HelpTag + empty + + + Help tag + module + true + + true + + + + Help tag + toolSignature + true + + true + + + + + + Output a random number for the learner and passon flash movies to communicate directly. generate unique ID @@ -131,7 +179,15 @@ true + + Output stylesheet based on the user preferences. + style + false + true + + + Index: lams_learning/web/WEB-INF/tags/Tab.tag =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_learning/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_learning/web/WEB-INF/tags/Tab.tag (.../Tab.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -1,32 +1,32 @@ <%/**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ - /** - * Tab.tag - * Author: Mitchell Seaton - * Description: Creates a tab element. - * Wiki: - */ +/** + * Tab.tag + * Author: Mitchell Seaton + * Description: Creates a tab element. + * Wiki: + */ %> <%@ tag body-content="empty"%> Index: lams_learning/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_learning/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_learning/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -1,32 +1,32 @@ <%/**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ - /** - * TabBody.tag - * Author: Mitchell Seaton - * Description: Creates the body container for a tab element - * Wiki: - */ +/** + * TabBody.tag + * Author: Mitchell Seaton + * Description: Creates the body container for a tab element + * Wiki: + */ %> <%@ tag body-content="scriptless"%> Index: lams_learning/web/WEB-INF/tags/Tabs.tag =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_learning/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_learning/web/WEB-INF/tags/Tabs.tag (.../Tabs.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -1,32 +1,32 @@ <%/**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ - /** - * Tabs.tag - * Author: Mitchell Seaton - * Description: Create a tab list from a input collection or nested Tab tags. - * Wiki: - */ +/** + * Tabs.tag + * Author: Mitchell Seaton + * Description: Create a tab list from a input collection or nested Tab tags. + * Wiki: + */ %> <%@ tag body-content="scriptless"%> Index: lams_learning/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_learning/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_learning/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -1,32 +1,32 @@ <%/**************************************************************** - * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) - * ============================================================= - * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA - * - * http://www.gnu.org/licenses/gpl.txt - * **************************************************************** - */ + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ - /** - * Standard Head Items - * Author: Fiona Malikoff - * Description: Includes all the standard head items e.g. the - * lams css files, sets the content type, standard javascript files. - */ +/** + * Standard Head Items + * Author: Fiona Malikoff + * Description: Includes all the standard head items e.g. the + * lams css files, sets the content type, standard javascript files. + */ %> <%@ tag body-content="empty"%> @@ -44,7 +44,8 @@ - + + Index: lams_learning/web/close.jsp =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 --- lams_learning/web/close.jsp (.../close.jsp) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_learning/web/close.jsp (.../close.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) @@ -24,20 +24,14 @@ window.close(); -

 

-
+
-
- -
- -

 

-