Index: lams_admin/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_admin/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_admin/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r4acbf314102d7308ac564583d7af467aa5275617 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 Binary files differ Index: lams_central/.settings/org.eclipse.core.resources.prefs =================================================================== diff -u --- lams_central/.settings/org.eclipse.core.resources.prefs (revision 0) +++ lams_central/.settings/org.eclipse.core.resources.prefs (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -0,0 +1,3 @@ +#Fri Jul 01 16:45:15 EEST 2011 +eclipse.preferences.version=1 +encoding//mobile/mobileUsage.txt=UTF-8 Index: lams_central/conf/xdoclet/taglib-tag.xml =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_central/conf/xdoclet/taglib-tag.xml (.../taglib-tag.xml) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_central/conf/xdoclet/taglib-tag.xml (.../taglib-tag.xml) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -262,6 +262,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -270,8 +279,4 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/LearnerFlashEnabledTag.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/web/tag/LearnerFlashEnabledTag.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/LearnerFlashEnabledTag.java (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -0,0 +1,86 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.web.tag; + +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.tagext.SimpleTagSupport; + +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; + +/** + * JSP tag. It checks whether Flash enabled for learner. + * + * @jsp.tag name="LearnerFlashEnabled" + * body-content="empty" + * display-name="Checks whether Flash enabled for learner" + * description="Checks whether Flash enabled for learner" + * + * @author Fiona Malikoff + * @author Andrey Balan + */ +public class LearnerFlashEnabledTag extends SimpleTagSupport { + + @Override + public void doTag() throws JspException, IOException { + + boolean serverEnableFlash = Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE); + boolean forceMobileDevToUseFlashless = Configuration.getAsBoolean(ConfigurationKeys.FORCE_MOBILE_DEV_TO_USE_FLASHLESS); + + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + Boolean userEnableFlash = user.getEnableFlash(); + + //Checks if it's a mobile device based on a device list + PageContext pageContext = (PageContext) getJspContext(); + HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); + String userAgent = request.getHeader("User-Agent").toLowerCase(); + Boolean isMobileDevice = LearnerFlashEnabledTag.isMobileDevice(userAgent); + + //main logic happens here + boolean isLearnerFlashEnabled = serverEnableFlash && userEnableFlash && (!forceMobileDevToUseFlashless || !isMobileDevice); + getJspContext().getOut().write(String.valueOf(isLearnerFlashEnabled)); + } + + /** + * Checks if it's a mobile device based on a device list. + * + * @return + */ + public static boolean isMobileDevice(String userAgent) { + + // Regexes are taken from http://detectmobilebrowser.com/download/jsp (Regex updated version: 30 June 2010). And + // we might need to update it somewhere in the future. + return userAgent.matches(".*(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).*") + || userAgent.substring(0,4).matches("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\\-"); + } +} \ No newline at end of file Index: lams_central/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -187,6 +187,17 @@ + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + + + + Output stylesheet based on the user preferences. User's chosen stylesheet @@ -496,6 +507,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +524,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -r0f432e857d0ba8120399d48306cf740f9b598522 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 0f432e857d0ba8120399d48306cf740f9b598522) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -142,6 +142,8 @@ public static String ALLOW_EDIT_ON_FLY = "AllowLiveEdit"; public static String SHOW_ALL_MY_LESSON_LINK = "ShowAllMyLessonLink"; + + public static String FORCE_MOBILE_DEV_TO_USE_FLASHLESS = "ForceMobileDevToUseFlashless"; public static String LDAP_PROVISIONING_ENABLED = "LDAPProvisioningEnabled"; Index: lams_gradebook/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_gradebook/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_gradebook/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_gradebook/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_learning/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_learning/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,17 +496,22 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - + Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_learning/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_monitoring/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_monitoring/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -123,6 +123,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 + + + + + + Help tag Help tag @@ -167,26 +187,6 @@ - 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 stylesheet based on the user preferences. User's chosen stylesheet @@ -289,11 +289,6 @@ true - index - false - true - - indexed false true @@ -466,6 +461,10 @@ ImgButtonWrapper /WEB-INF/tags/ImgButtonWrapper.tag + + + TextSearch + /WEB-INF/tags/TextSearch.tag textarea @@ -497,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_assessment/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Index: lams_tool_chat/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_chat/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_chat/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -501,6 +501,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -509,9 +518,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -492,6 +492,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -500,9 +509,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Index: lams_tool_dimdim/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_dimdim/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_dimdim/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_dimdim/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_forum/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_forum/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_gmap/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_gmap/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -123,6 +123,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 + + + + + + Help tag Help tag @@ -167,26 +187,6 @@ - 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 stylesheet based on the user preferences. User's chosen stylesheet @@ -461,6 +461,10 @@ ImgButtonWrapper /WEB-INF/tags/ImgButtonWrapper.tag + + + TextSearch + /WEB-INF/tags/TextSearch.tag textarea @@ -492,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -500,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_images/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Index: lams_tool_lamc/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_lamc/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_lamc/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_laqa/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_laqa/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Index: lams_tool_mindmap/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_mindmap/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_mindmap/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_nb/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_nb/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_notebook/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_notebook/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_notebook/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -501,6 +501,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -509,9 +518,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_pixlr/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_pixlr/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_pixlr/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -501,6 +501,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -509,9 +518,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_pixlr/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_sbmt/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_sbmt/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_scribe/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_scribe/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -496,6 +496,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -504,9 +513,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Index: lams_tool_videorecorder/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_videorecorder/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_videorecorder/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -501,6 +501,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -509,9 +518,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_vote/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_vote/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/web/WEB-INF/lams.tld =================================================================== diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_tool_wiki/web/WEB-INF/lams.tld (.../lams.tld) (revision 8179037dc958585c054547eb7de9be14c6aed233) +++ lams_tool_wiki/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -497,6 +497,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -505,9 +514,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_www/web/WEB-INF/lams.tld =================================================================== diff -u -r6ad7c80a4aa74cf926212c94a78498cc24916a77 -r3ed103dc1c4ba8816d2ffbf0817c550adf156e12 --- lams_www/web/WEB-INF/lams.tld (.../lams.tld) (revision 6ad7c80a4aa74cf926212c94a78498cc24916a77) +++ lams_www/web/WEB-INF/lams.tld (.../lams.tld) (revision 3ed103dc1c4ba8816d2ffbf0817c550adf156e12) @@ -492,6 +492,15 @@ true + + Checks whether Flash enabled for learner + Checks whether Flash enabled for learner + + + LearnerFlashEnabled + org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag + empty + head /WEB-INF/tags/Head.tag @@ -500,9 +509,5 @@ ProgressOutput /WEB-INF/tags/ProgressOutput.tag - - LearnerFlashEnabled - /WEB-INF/tags/LearnerFlashEnabled.tag - Fisheye: Tag 3ed103dc1c4ba8816d2ffbf0817c550adf156e12 refers to a dead (removed) revision in file `lams_www/web/WEB-INF/tags/LearnerFlashEnabled.tag'. Fisheye: No comparison available. Pass `N' to diff?