Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v diff -u -r1.55.2.9 -r1.55.2.10 --- lams_tool_forum/conf/language/lams/ApplicationResources.properties 9 Nov 2015 03:21:03 -0000 1.55.2.9 +++ lams_tool_forum/conf/language/lams/ApplicationResources.properties 4 Mar 2016 00:25:26 -0000 1.55.2.10 @@ -245,6 +245,7 @@ message.complete.or.cancel.reply =Please complete or cancel the current reply before starting a new reply. message.complete.or.cancel.edit =Please complete or cancel the current edit before starting a new edit. error.cannot.redisplay.please.refresh =Your changes have been saved but cannot be redisplayed. Please select refresh to reload the forum messages. +label.topics =Topics #======= End labels: Exported 239 labels for en AU ===== Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v diff -u -r1.61.2.4 -r1.61.2.5 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 25 Nov 2015 07:50:48 -0000 1.61.2.4 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 4 Mar 2016 00:25:26 -0000 1.61.2.5 @@ -207,7 +207,7 @@ // for paging long topics & inlining reply public static final String PAGE_LAST_ID = "pageLastId"; public static final String PAGE_SIZE = "size"; - public static final int DEFAULT_PAGE_SIZE = 2; + public static final int DEFAULT_PAGE_SIZE = 50; public static final String ATTR_MESS_ID = "messageUid"; public static final String ATTR_THREAD_ID = "threadUid"; public static final String ATTR_NO_MORE_PAGES = "noMorePages"; Index: lams_tool_forum/web/WEB-INF/urlrewrite.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/urlrewrite.xml,v diff -u -r1.4.2.1 -r1.4.2.2 --- lams_tool_forum/web/WEB-INF/urlrewrite.xml 23 Apr 2015 12:51:42 -0000 1.4.2.1 +++ lams_tool_forum/web/WEB-INF/urlrewrite.xml 4 Mar 2016 00:25:26 -0000 1.4.2.2 @@ -9,38 +9,6 @@ --> - - - - The rule means that requests to tool's learning jsp will be redirected to /learning/mobile/ folder - containing mobile version of jsps. - Regexes are taken from http://detectmobilebrowser.com/download/jsp. and we might need to update it somewhere in the future. - - .*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i - ^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i - ^/includes/learnerLayout.jsp$ - /includes/mobileLearnerLayout.jsp - - - - - Handles the exceptional case of /jsps/learning/viewtopic.jsp which doens't use tiles. - - .*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i - ^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i - ^/jsps/learning/viewtopic.jsp$ - /jsps/learning/mobile/viewtopic.jsp - - - - - Handles the exceptional case of /jsps/learning/message/topicviewwrapper.jsp which doesn't use tiles. - - .*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino).*?i - ^(1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\-(n|u)|c55\\/|capi|ccwa|cdm\\-|cell|chtm|cldc|cmd\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\\-|_)|g1 u|g560|gene|gf\\-5|g\\-mo|go(\\.w|od)|gr(ad|un)|haie|hcit|hd\\-(m|p|t)|hei\\-|hi(pt|ta)|hp( i|ip)|hs\\-c|ht(c(\\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\\-(20|go|ma)|i230|iac( |\\-|\\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\\/)|klon|kpt |kwc\\-|kyo(c|k)|le(no|xi)|lg( g|\\/(k|l|u)|50|54|e\\-|e\\/|\\-[a-w])|libw|lynx|m1\\-w|m3ga|m50\\/|ma(te|ui|xo)|mc(01|21|ca)|m\\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\\-2|po(ck|rt|se)|prox|psio|pt\\-g|qa\\-a|qc(07|12|21|32|60|\\-[2-7]|i\\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\\-|oo|p\\-)|sdk\\/|se(c(\\-|0|1)|47|mc|nd|ri)|sgh\\-|shar|sie(\\-|m)|sk\\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\\-|v\\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\\-|tdg\\-|tel(i|m)|tim\\-|t\\-mo|to(pl|sh)|ts(70|m\\-|m3|m5)|tx\\-9|up(\\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\\-|2|g)|yas\\-|your|zeto|zte\\-).*?i - ^/jsps/learning/message/topicviewwrapper.jsp$ - /jsps/learning/mobile/message/topicviewwrapper.jsp - - + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/Alert.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/WEB-INF/tags/DefineLater.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/DefineLater.tag,v diff -u -r1.3 -r1.3.14.1 --- lams_tool_forum/web/WEB-INF/tags/DefineLater.tag 27 Oct 2006 02:39:34 -0000 1.3 +++ lams_tool_forum/web/WEB-INF/tags/DefineLater.tag 4 Mar 2016 00:25:26 -0000 1.3.14.1 @@ -1,6 +1,6 @@ <% - /**************************************************************** + /**************************************************************** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ @@ -49,10 +49,18 @@ -

- -

-
- +
+
+
+ +
+
+
+
+ +
+
\ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/Page.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld 24 Feb 2016 12:35:48 -0000 1.3.2.2 +++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld 4 Mar 2016 00:25:26 -0000 1.3.2.3 @@ -432,12 +432,12 @@ /WEB-INF/tags/DefineLater.tag - ImgButtonWrapper - /WEB-INF/tags/ImgButtonWrapper.tag - + Alert + /WEB-INF/tags/Alert.tag + - TextSearch - /WEB-INF/tags/TextSearch.tag + Page + /WEB-INF/tags/Page.tag textarea Index: lams_tool_forum/web/common/messages.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/messages.jsp,v diff -u -r1.5 -r1.5.14.1 --- lams_tool_forum/web/common/messages.jsp 10 Oct 2006 04:19:50 -0000 1.5 +++ lams_tool_forum/web/common/messages.jsp 4 Mar 2016 00:25:26 -0000 1.5.14.1 @@ -1,8 +1,8 @@ <%-- Error Messages --%> -

+ -
+ -

- \ No newline at end of file + + Index: lams_tool_forum/web/includes/learnerLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/learnerLayout.jsp,v diff -u -r1.6.12.3 -r1.6.12.4 --- lams_tool_forum/web/includes/learnerLayout.jsp 24 Feb 2016 12:35:48 -0000 1.6.12.3 +++ lams_tool_forum/web/includes/learnerLayout.jsp 4 Mar 2016 00:25:26 -0000 1.6.12.4 @@ -23,7 +23,12 @@ + + + + + - - - - -
+ -

- -

- -
+
+ -
+ -
+ + -
+ - - - - - - + + + + + + -
+ - -
- - - - -
+ + + + + + + + + + + + + + + + + + + - -
- - - -
- - - -
- - - -
- - - -
+ @@ -105,92 +98,83 @@ -
- + - + <%@ include file="/common/messages.jsp"%> - -
- - - - - - - - - - - - - -
- + <%@ include file="/jsps/learning/message/topiclist.jsp"%> + + -
-

-

- -

-
- - -

- -

- - -

- -

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

+ +

+ + +

+ +

+ + +
+ + + + + +
+
- +
+ + + + + + - + styleClass="btn btn-primary voffset5 pull-right"> + - -
- + -
- - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + - - -
-
+ Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewtopic.jsp,v diff -u -r1.25.2.6 -r1.25.2.7 --- lams_tool_forum/web/jsps/learning/viewtopic.jsp 24 Feb 2016 12:35:48 -0000 1.25.2.6 +++ lams_tool_forum/web/jsps/learning/viewtopic.jsp 4 Mar 2016 00:25:26 -0000 1.25.2.7 @@ -35,9 +35,10 @@ var pathToImageFolder = "${lams}images/css/"; + + - - - +
+ + - -
-
- - - - - - -
- - + + +
- +
+ + + ${buttonPanel} + +
+ <%@ include file="message/topicview.jsp"%>
+ + + ${buttonPanel} + + Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/bodyarea.jsp,v diff -u -r1.14.2.1 -r1.14.2.2 --- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp 30 Dec 2014 09:44:06 -0000 1.14.2.1 +++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp 4 Mar 2016 00:25:26 -0000 1.14.2.2 @@ -1,32 +1,29 @@ <%@ include file="/common/taglibs.jsp"%> -
- <%-- for validateForm() method --%> - + -
+ ${sessionMap.minCharacters} -
+ - - <%-- Does not user general tag becuase this field need keep compatible with CKEditor's content --%> - + <%-- Does not user general tag because this field need keep compatible with CKEditor's content --%> + -
+
<%-- If limitChars == 0, then we don't want to limit the characters at all. --%> @@ -150,8 +147,6 @@ }); - -
+ -
Fisheye: Tag 1.4.12.3 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/learning/message/msgattachment.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/msgview.jsp,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_tool_forum/web/jsps/learning/message/msgview.jsp 20 May 2015 12:30:14 -0000 1.2.2.3 +++ lams_tool_forum/web/jsps/learning/message/msgview.jsp 4 Mar 2016 00:25:26 -0000 1.2.2.4 @@ -6,15 +6,6 @@ - - - - - - - - - highlight @@ -23,166 +14,146 @@ -
px;"> - - - - - - - - - - + <%-- outermsg${msgDto.message.uid} is used to replace existing message areas when a message is edited. --%> + + +
+
+ + +
+
px;" id="outermsg${msgDto.message.uid}"> + + +
+
+

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

+
+ +
+ + + + + +   + + + -
- - +
+ + + + + + + + + + +   + +
- - - - - - - + + +
+
+   +
+   + + + + + + + + +
- - - -
- - - - - - - - -
- - - - - - - - - - - - - -
- - - - - - - - -
-
- " class="space-left float-left"> - - - - - - - - - - - - -
-
- - -
- -
- - -
- - - - - - - - -
-
- - <%@ include file="/jsps/learning/ratingStars.jsp"%> - - - - - - - - - + +
+
+ + + <%@ include file="/jsps/learning/ratingStars.jsp"%> + + + + + + + + · - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + · + - - - - - - - - - - - - - - - - - -
-
+ + + + + + + · + + + + + + + + + + + +
+
+
+
+
Index: lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp 9 Feb 2016 18:53:29 -0000 1.1.2.4 +++ lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp 4 Mar 2016 00:25:26 -0000 1.1.2.5 @@ -6,17 +6,17 @@ Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp,v diff -u -r1.18.2.5 -r1.18.2.6 --- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp 23 Apr 2015 12:51:42 -0000 1.18.2.5 +++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp 4 Mar 2016 00:25:26 -0000 1.18.2.6 @@ -1,40 +1,49 @@ <%@ include file="/common/taglibs.jsp"%> -
- +
+ +   +
- - - -
- - * +
+
+ <%@include file="bodyarea.jsp"%>
-<%@include file="bodyarea.jsp"%> - - -
- -
- -
- <%@ include file="/jsps/learning/message/msgattachment.jsp"%> -
- +
+ +
+ + + + + + : + + + + +
+ + + + + + + +
+
-
-
- - - - - - -
+
+ + + + + +
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicform.jsp,v diff -u -r1.17.2.3 -r1.17.2.4 --- lams_tool_forum/web/jsps/learning/message/topicform.jsp 4 Mar 2015 20:31:56 -0000 1.17.2.3 +++ lams_tool_forum/web/jsps/learning/message/topicform.jsp 4 Mar 2016 00:25:26 -0000 1.17.2.4 @@ -1,44 +1,30 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - - - - - - - - +
+ +   + +
- - - +
+
+ <%@include file="bodyarea.jsp"%> +
-
-
- -
- -
- *
- <%@include file="bodyarea.jsp"%> -
-
-
- -
- - - - - - - - - -
+ +
+
+
+ +
+ -
+ + + + + +  + + + Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiclist.jsp,v diff -u -r1.20.2.3 -r1.20.2.4 --- lams_tool_forum/web/jsps/learning/message/topiclist.jsp 21 May 2015 08:32:45 -0000 1.20.2.3 +++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp 4 Mar 2016 00:25:26 -0000 1.20.2.4 @@ -2,30 +2,53 @@ <%@ include file="/common/taglibs.jsp"%> - - +
+
+
+ + + + + + + + + + + + + + +
+
+
+ - - - - - + + - -
+ + + + +  
@@ -43,7 +66,7 @@ - "> + @@ -73,5 +96,7 @@
+ + +
+
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp,v diff -u -r1.18.2.5 -r1.18.2.6 --- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp 23 Apr 2015 12:51:42 -0000 1.18.2.5 +++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp 4 Mar 2016 00:25:26 -0000 1.18.2.6 @@ -1,43 +1,36 @@ <%@ include file="/common/taglibs.jsp"%> -
- -
+
+   +   + +
- - - -
- - * +
+
+ <%@include file="bodyarea.jsp"%>
-<%@include file="bodyarea.jsp"%> -
- -
- +
+ + -
- - ${sessionMap.uploadMaxFileSize} - +
+ + ${sessionMap.uploadMaxFileSize} + +
+
- - -
-
- - - - - - -
+ +
+ + + + + +
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicview.jsp,v diff -u -r1.38.2.3 -r1.38.2.4 --- lams_tool_forum/web/jsps/learning/message/topicview.jsp 21 May 2015 08:32:45 -0000 1.38.2.3 +++ lams_tool_forum/web/jsps/learning/message/topicview.jsp 4 Mar 2016 00:25:26 -0000 1.38.2.4 @@ -3,7 +3,7 @@ - + @@ -26,10 +26,10 @@ $(".button").click(function (e) { e.stopPropagation(); }); - $(".rating-stars-div").click(function (e) { + $(".msg-footer").click(function (e) { e.stopPropagation(); }); - $("#attachments").click(function (e) { + $(".attachments").click(function (e) { e.stopPropagation(); }); @@ -40,14 +40,7 @@ // set up the new reply area var replyDiv = document.createElement("div"); replyDiv.id = 'reply'; - - if ( level == 0 ) { - $('#msg'+messageUid).after(replyDiv); - } else { - var parentDiv = document.getElementById('msg'+messageUid); - parentDiv.appendChild(replyDiv); - } - + $('#pb-msg'+messageUid).after(replyDiv); $(replyDiv).load(url); } } @@ -57,15 +50,13 @@ alert(''); } else { // set up the new edit area - var parentDiv = document.getElementById('msg'+messageUid); var editDiv = document.createElement("div"); editDiv.id = 'edit'; - parentDiv.appendChild(editDiv); + $('#pb-msg'+messageUid).after(editDiv); $(editDiv).load(url); } } - - + @@ -88,7 +79,7 @@
- +
@@ -114,8 +109,8 @@ -
+
- " class="button"> + " class="btn btn-xs btn-default">
Index: lams_tool_forum/web/jsps/learning/message/topicviewwrapper.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicviewwrapper.jsp,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_tool_forum/web/jsps/learning/message/topicviewwrapper.jsp 9 Feb 2016 18:53:29 -0000 1.2.2.3 +++ lams_tool_forum/web/jsps/learning/message/topicviewwrapper.jsp 4 Mar 2016 00:25:26 -0000 1.2.2.4 @@ -11,7 +11,13 @@ + + + + + + <%@ include file="topicview.jsp"%>
@@ -97,6 +88,10 @@ <%@ include file="msgview.jsp"%> + + +
+