Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v diff -u -r1.45.2.9 -r1.45.2.10 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 2 Jun 2016 14:50:41 -0000 1.45.2.9 +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 13 Oct 2016 06:43:46 -0000 1.45.2.10 @@ -134,13 +134,13 @@ if (isSysAdmin && stateId.equals(OrganisationState.ACTIVE)) { if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) { moreLinks.add(new IndexLinkBean("index.classman", - "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "manage-group-button", null)); + "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "fa fa-fw fa-users", null)); } } if (org.getEnableGradebookForLearners() && roles.contains(Role.ROLE_LEARNER)) { String link = "javascript:showGradebookLearnerDialog(" + org.getOrganisationId() + ")"; - links.add(new IndexLinkBean("index.coursegradebook.learner", link, "my-grades-button", null)); + links.add(new IndexLinkBean("index.coursegradebook.learner", link, "fa fa-fw fa-list-ol", null)); } if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER) @@ -149,31 +149,31 @@ if ((!isSysAdmin) && (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER))) { moreLinks.add(new IndexLinkBean("index.classman", - "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "manage-group-button", + "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "fa fa-fw fa-users", null)); } if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_AUTHOR) || roles.contains(Role.ROLE_MONITOR))) { moreLinks.add(new IndexLinkBean("index.orggroup", - "javascript:showOrgGroupDialog(" + org.getOrganisationId() + ")", "manage-group-button", + "javascript:showOrgGroupDialog(" + org.getOrganisationId() + ")", "fa fa-fw fa-users", null)); } if (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR)) { String name = org.getEnableSingleActivityLessons() ? "index.addlesson.single" : "index.addlesson"; links.add(new IndexLinkBean(name, "javascript:showAddLessonDialog(" + org.getOrganisationId() + ")", - "add-lesson-button", null)); + "fa fa-fw fa-plus", null)); } moreLinks.add(new IndexLinkBean("index.searchlesson", - "javascript:showSearchLessonDialog(" + org.getOrganisationId() + ")", "search-lesson", + "javascript:showSearchLessonDialog(" + org.getOrganisationId() + ")", "fa fa-fw fa-search", "index.searchlesson.tooltip")); // Adding course notifications links if enabled if (org.getEnableCourseNotifications() && (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) { moreLinks.add(new IndexLinkBean("index.emailnotifications", "javascript:showNotificationsDialog(" + org.getOrganisationId() + ",null)", - "course-notifications", "index.emailnotifications.tooltip")); + "fa fa-fw fa-bullhorn", "index.emailnotifications.tooltip")); } // Adding gradebook course monitor links if enabled @@ -189,14 +189,14 @@ String name = org.getParentOrganisation().getEnableSingleActivityLessons() ? "index.addlesson.single" : "index.addlesson"; links.add(new IndexLinkBean(name, "javascript:showAddLessonDialog(" + org.getOrganisationId() + ")", - "add-lesson-button", null)); + "fa fa-fw fa-plus", null)); } // Adding gradebook course monitor links if enabled if (org.getParentOrganisation().getEnableGradebookForMonitors() && (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN))) { String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")"; - moreLinks.add(new IndexLinkBean("index.coursegradebook.subgroup", link, "my-grades-button", null)); + moreLinks.add(new IndexLinkBean("index.coursegradebook.subgroup", link, "fa fa-fw fa-list-ol", null)); } } } @@ -319,13 +319,13 @@ if ((isGroupManagerOrMonitor && stateId.equals(OrganisationState.ACTIVE)) || (stateId.equals(OrganisationState.ARCHIVED) && roles.contains(Role.ROLE_GROUP_MANAGER))) { lessonLinks.addFirst(new IndexLinkBean("index.monitor", - "javascript:showMonitorLessonDialog(" + bean.getId() + ")", "mycourses-monitor-img", null)); + "javascript:showMonitorLessonDialog(" + bean.getId() + ")", "fa fa-fw fa-heartbeat", null)); } // Adding lesson notifications links if enabled if (isGroupManagerOrMonitor && bean.isEnableLessonNotifications()) { lessonLinks.addFirst(new IndexLinkBean("index.emailnotifications", - "javascript:showNotificationsDialog(null," + bean.getId() + ")", "mycourses-notifications-img", + "javascript:showNotificationsDialog(null," + bean.getId() + ")", "fa fa-fw fa-bullhorn", "index.emailnotifications.tooltip")); } @@ -334,21 +334,21 @@ || ((parent != null) && parent.getEnableGradebookForMonitors()))) { String link = "javascript:showGradebookLessonDialog(" + bean.getId() + ")"; lessonLinks - .addFirst(new IndexLinkBean("index.coursegradebookmonitor", link, "mycourses-mark-img", null)); + .addFirst(new IndexLinkBean("index.coursegradebookmonitor", link, "fa fa-fw fa-check-square-o", null)); } // Add lesson conditions if (isGroupManagerOrMonitor) { String conditionsLink = "javascript:showConditionsDialog(" + bean.getId() + ")"; - lessonLinks.addFirst(new IndexLinkBean("index.conditions", conditionsLink, "mycourses-conditions-img", + lessonLinks.addFirst(new IndexLinkBean("index.conditions", conditionsLink, "fa fa-fw fa-code-fork", "index.conditions.tooltip")); } // Add delete lesson option if (isGroupManagerOrMonitor) { String removeLessonLink = "javascript:removeLesson(" + bean.getId() + ")"; lessonLinks.addFirst(new IndexLinkBean("index.remove.lesson", removeLessonLink, - "mycourses-removelesson-img", "index.remove.lesson.tooltip")); + "fa fa-fw fa-trash-o", "index.remove.lesson.tooltip")); } if (lessonLinks.size() > 0) { @@ -399,4 +399,4 @@ } return DisplayGroupAction.securityService; } -} \ No newline at end of file +} Index: lams_central/web/group.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/group.jsp,v diff -u -r1.9 -r1.9.2.1 --- lams_central/web/group.jsp 20 Aug 2013 12:17:10 -0000 1.9 +++ lams_central/web/group.jsp 13 Oct 2016 06:43:46 -0000 1.9.2.1 @@ -4,21 +4,17 @@ <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-lams" prefix="lams"%> +
+ - -
- "> - -
-
- <%@ include file="groupHeader.jsp"%> +
-
+
<%@ include file="groupContents.jsp"%>
@@ -28,7 +24,7 @@
- + ( ) @@ -42,4 +38,14 @@
-
\ No newline at end of file +
+ + + + +
+ "> + +
+
+ Index: lams_central/web/groupContents.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/groupContents.jsp,v diff -u -r1.23 -r1.23.2.1 --- lams_central/web/groupContents.jsp 20 Aug 2013 12:17:10 -0000 1.23 +++ lams_central/web/groupContents.jsp 13 Oct 2016 06:43:46 -0000 1.23.2.1 @@ -7,7 +7,7 @@
- + @@ -16,32 +16,26 @@ - ">  + "> - ">  + "> - ">  + "> - ">  + "> - - \ No newline at end of file + Index: lams_central/web/groupHeader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/groupHeader.jsp,v diff -u -r1.9.2.2 -r1.9.2.3 --- lams_central/web/groupHeader.jsp 8 Mar 2016 04:24:30 -0000 1.9.2.2 +++ lams_central/web/groupHeader.jsp 13 Oct 2016 06:43:46 -0000 1.9.2.3 @@ -3,63 +3,57 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-core" prefix="c"%> - + -
-
-
- -
-
 
-
-
    - -
  • - title="" - + +
    +
    + + + +
  • +
    +
+
+ -
-
-
- title="" - - > - -
-
 
+
+
+ + +
-
    - - -
  • - -
  • -
    -
-
-
- title="" - - > - -
+ - \ No newline at end of file + Index: lams_central/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v diff -u -r1.77.2.20 -r1.77.2.21 --- lams_central/web/main.jsp 21 Apr 2016 09:13:16 -0000 1.77.2.20 +++ lams_central/web/main.jsp 13 Oct 2016 06:43:46 -0000 1.77.2.21 @@ -20,11 +20,14 @@ + + - + + @@ -34,6 +37,8 @@ + + - + +
+
+
+
+
+ +
+
+
+
+
+ - \ No newline at end of file + Index: lams_central/web/css/defaultHTML.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML.css,v diff -u -r1.58.2.8 -r1.58.2.9 --- lams_central/web/css/defaultHTML.css 11 May 2016 07:07:59 -0000 1.58.2.8 +++ lams_central/web/css/defaultHTML.css 13 Oct 2016 06:43:46 -0000 1.58.2.9 @@ -21,17 +21,9 @@ a { color: #47bc23; text-decoration: none; - border-bottom: 1px dotted #47bc23; text-decoration: none; } -a:hover { - color: #47bc23; - text-decoration: none; - border-bottom: 1px solid #47bc23; - text-decoration: none; -} - body.stripes { background: url('../images/css/diagonal_bg.gif'); } @@ -106,16 +98,6 @@ margin-bottom: 18px; } -ul { - margin-left: 25px; - margin-right: 30px; -} - -ul li { - list-style-type: circle; - padding-bottom: 5px; -} - ol { margin-left: 25px; margin-right: 30px; @@ -342,7 +324,6 @@ #content a { color: #47bc23; text-decoration: none; - border-bottom: 1px dotted #47bc23; } #content a:hover { @@ -480,45 +461,6 @@ font-size: 11px; } -#content-main a.sequence-name-link { - color: #0087E5; - text-decoration: none; -} - -#content-main a:hover.sequence-name-link { - color: #0087E5; - text-decoration: none; - border-bottom: 1px solid #0087E5; -} - -#content-main a.disabled-sequence-name-link { - color: #FF6666; - text-decoration: none; - border-bottom: 1px dotted #FF6666; -} - -#content-main a:hover.disabled-sequence-name-link { - color: #FF6666; - text-decoration: none; - border-bottom: 1px solid #FF6666; -} - -#content-main a.sequence-action-link { - color: #47bc23; - text-decoration: none; - border: 0px; - font-variant: small-caps; - margin-left: 20px; -} - -#content-main 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; @@ -878,149 +820,6 @@ /* ************************************************* -Login page styles - -********************************************** */ -#login-page { /*whole layout of login page*/ - margin: -35px 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: 370px; - float: left; - padding-left: 25px; - margin-top: 5px; -} - -#login-left-col h1 { - margin: 0px; - padding: 0px; -} - -#login-left-col h2 { - margin: 10px 0px 0px 3px; - padding: 0px; - font-weight: 100; - font-size: 1.5em; -} - -#login-left-col h3 { - color: #239CF7; - font-size: 11px; - margin: 8px 0px 0px 3px; -} - -#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; - list-style-type: none; -} - -#login-right-col { - width: 285px; - float: left; - margin-left: 17px; - 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: 0px; - margin-right: 50px; - text-align: right; -} - -#login-right-col a.button { - background: url('../images/css/btn_off.gif') no-repeat 0px 0px; - color: #333; - border: 0px none; - padding: 5px 20px 6px 20px; - text-decoration: none; -} - -#login-right-col 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; -} - -#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: arial, helvetica, sans-serif; - font-size: .9em; - color: #999; -} - -.clear { - clear: both -} - -/* -************************************************* - Floating button containers ********************************************** */ @@ -1135,11 +934,8 @@ padding-left: 10px; } -.mycourses-right-buttons { - float: right; +.course-right-buttons { padding-right: 20px; - height: 24px; - font-size: 11px } #content-main a.sorting { @@ -1189,7 +985,6 @@ #content-main a.sequence-name-link { color: #0087E5; text-decoration: none; - border-bottom: 1px dotted #0087E5; } #content-main a:hover.sequence-name-link { @@ -1216,8 +1011,8 @@ /************ The group name box **********/ .group-name { - margin-top: 25px; - margin-left: 80px; + margin-top: 20px; + margin-left: 30px; } .group-name p { @@ -1281,20 +1076,18 @@ .j-single-lesson { list-style: none; margin: 6px; - padding: 6px 9px; + padding: 3px 3px 3px 10px; position: relative; - /* CSS3 text shadow and rounded corners: */ - text-shadow: 1px 1px 0 white; } .j-single-lesson:hover { border-color: #9be0f9; background-color: #F0F8FF; display: block; /* CSS3 glow effect: */ - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; -moz-box-shadow: 0 0 5px #A6E5FD; -webkit-box-shadow: 0 0 5px #A6E5FD; box-shadow: 0 0 5px #A6E5FD; @@ -1311,7 +1104,8 @@ .lesson-actions { float: right; - opacity: 0.1; + font-size: 1.2em; + opacity: 0.3; filter: alpha(opacity = 10); /* msie */ } @@ -1322,23 +1116,18 @@ } .j-single-lesson:hover .mycourses-monitor-img { - background: url('../images/css/mycourses_monitor.png') no-repeat 0 0px; } .j-single-lesson:hover .mycourses-mark-img { - background: url('../images/css/mark.png') no-repeat 0 0px; } .j-single-lesson:hover .mycourses-notifications-img { - background: url('../images/css/notifications_go.png') no-repeat 0 0px; } .j-single-lesson:hover .mycourses-conditions-img { - background: url('../images/css/conditions.png') no-repeat 0 0px; } .j-single-lesson:hover .mycourses-removelesson-img { - background: url('../images/css/delete.png') no-repeat 0 0px; } .j-single-lesson:hover .mycourses-move-img { @@ -1368,31 +1157,99 @@ } .mycourses-monitor-img { - background: url('../images/css/mycourses_monitor_bw.png') no-repeat 0 0px; + position: relative; } + +/*replace the content value with the +corresponding value from the list below*/ + +.mycourses-monitor-img:before { + content: "\f1e5"; + font-family: FontAwesome; + font-style: normal; + font-weight: normal; + text-decoration: inherit; +/*--adjust as necessary--*/ + color: #000; + font-size: initial; + position: absolute; + left: 0; +} .mycourses-mark-img { - background: url('../images/css/mark_bw.png') no-repeat 0 0; + position:relative; } +.mycourses-mark-img:before { + content: "\f046"; + font-family: FontAwesome; + font-style: normal; + font-weight: normal; + text-decoration: inherit; +/*--adjust as necessary--*/ + color: #000; + font-size: initial; + position: absolute; + left: 0; +} + + .mycourses-notifications-img { - background: url('../images/css/notifications_go_bw.png') no-repeat 0 0; + position:relative; } +.mycourses-notifications-img:before { + content: "\f0a1"; + font-family: FontAwesome; + font-style: normal; + font-weight: normal; + text-decoration: inherit; +/*--adjust as necessary--*/ + color: #000; + font-size: initial; + position: absolute; + left: 0; +} + .mycourses-conditions-img { - background: url('../images/css/conditions_bw.png') no-repeat 0 0; + position:relative; } +.mycourses-conditions-img:before { + content: "\f126"; + font-family: FontAwesome; + font-style: normal; + font-weight: normal; + text-decoration: inherit; +/*--adjust as necessary--*/ + font-size: initial; + position: absolute; + padding-left:2px; +} .mycourses-removelesson-img { - background: url('../images/css/delete_bw.png') no-repeat 0 0; + position:relative; } +.mycourses-removelesson-img:before { + content: "\f014"; + font-family: FontAwesome; + font-style: normal; + font-weight: normal; + text-decoration: inherit; +/*--adjust as necessary--*/ + color: #000; + font-size: initial; + position: absolute; + left: 0; +} + + .mycourses-move-img { background: url('../images/css/arrow_move.png') no-repeat 0 0; } .lesson-action-label { - display: none; + /*-- display: none; --*/ color: #999; } Index: lams_central/web/css/defaultHTML_learner.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_learner.css,v diff -u -r1.32.2.33 -r1.32.2.34 --- lams_central/web/css/defaultHTML_learner.css 10 Oct 2016 00:58:17 -0000 1.32.2.33 +++ lams_central/web/css/defaultHTML_learner.css 13 Oct 2016 06:43:46 -0000 1.32.2.34 @@ -64,6 +64,26 @@ } /* Spacer classes */ + +.offset2 { + margin: 2px; +} +.offset3 { + margin: 3px; +} +.offset5 { + margin: 5px; +} +.offset10 { + margin: 10px; +} +.offset15 { + margin: 15px; +} +.offset20 { + margin: 20px; +} + .voffset2 { margin-top: 2px; } Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/css/jquery-ui-bootstrap-theme.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/css/images/ui-bg_flat_0_aaaaaa_40x100.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-bg_flat_0_aaaaaa_40x100.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-bg_glass_55_fbf9ee_1x400.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-bg_glass_55_fbf9ee_1x400.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-bg_glass_65_ffffff_1x400.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-bg_glass_65_ffffff_1x400.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-bg_glass_75_dadada_1x400.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-bg_glass_75_dadada_1x400.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-bg_glass_75_e6e6e6_1x400.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-bg_glass_75_e6e6e6_1x400.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-bg_glass_75_ffffff_1x400.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-bg_glass_75_ffffff_1x400.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-bg_highlight-soft_75_cccccc_1x100.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-bg_inset-soft_95_fef1ec_1x100.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-icons_222222_256x240.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-icons_222222_256x240.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-icons_2e83ff_256x240.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-icons_2e83ff_256x240.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-icons_454545_256x240.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-icons_454545_256x240.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-icons_888888_256x240.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-icons_888888_256x240.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-icons_cd0a0a_256x240.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-icons_cd0a0a_256x240.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/css/images/ui-icons_f6cf3b_256x240.png =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/images/Attic/ui-icons_f6cf3b_256x240.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: lams_central/web/includes/javascript/jquery.ui.touch-punch.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/jquery.ui.touch-punch.js,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_central/web/includes/javascript/jquery.ui.touch-punch.js 10 Oct 2016 00:58:17 -0000 1.1.2.1 +++ lams_central/web/includes/javascript/jquery.ui.touch-punch.js 13 Oct 2016 06:43:46 -0000 1.1.2.2 @@ -8,176 +8,4 @@ * jquery.ui.widget.js * jquery.ui.mouse.js */ -(function ($) { - - debugger; - // Detect touch support - $.support.touch = 'ontouchend' in document; - - // Ignore browsers without touch support - if (!$.support.touch) { - return; - } - - var mouseProto = $.ui.mouse.prototype, - _mouseInit = mouseProto._mouseInit, - _mouseDestroy = mouseProto._mouseDestroy, - touchHandled; - - /** - * Simulate a mouse event based on a corresponding touch event - * @param {Object} event A touch event - * @param {String} simulatedType The corresponding mouse event - */ - function simulateMouseEvent (event, simulatedType) { - - // Ignore multi-touch events - if (event.originalEvent.touches.length > 1) { - return; - } - - event.preventDefault(); - - var touch = event.originalEvent.changedTouches[0], - simulatedEvent = document.createEvent('MouseEvents'); - - // Initialize the simulated mouse event using the touch event's coordinates - simulatedEvent.initMouseEvent( - simulatedType, // type - true, // bubbles - true, // cancelable - window, // view - 1, // detail - touch.screenX, // screenX - touch.screenY, // screenY - touch.clientX, // clientX - touch.clientY, // clientY - false, // ctrlKey - false, // altKey - false, // shiftKey - false, // metaKey - 0, // button - null // relatedTarget - ); - - // Dispatch the simulated event to the target element - event.target.dispatchEvent(simulatedEvent); - } - - /** - * Handle the jQuery UI widget's touchstart events - * @param {Object} event The widget element's touchstart event - */ - mouseProto._touchStart = function (event) { - - debugger; - - var self = this; - - // Ignore the event if another widget is already being handled - if (touchHandled || !self._mouseCapture(event.originalEvent.changedTouches[0])) { - return; - } - - // Set the flag to prevent other widgets from inheriting the touch event - touchHandled = true; - - // Track movement to determine if interaction was a click - self._touchMoved = false; - - // Simulate the mouseover event - simulateMouseEvent(event, 'mouseover'); - - // Simulate the mousemove event - simulateMouseEvent(event, 'mousemove'); - - // Simulate the mousedown event - simulateMouseEvent(event, 'mousedown'); - }; - - /** - * Handle the jQuery UI widget's touchmove events - * @param {Object} event The document's touchmove event - */ - mouseProto._touchMove = function (event) { - - // Ignore event if not handled - if (!touchHandled) { - return; - } - - // Interaction was not a click - this._touchMoved = true; - - // Simulate the mousemove event - simulateMouseEvent(event, 'mousemove'); - }; - - /** - * Handle the jQuery UI widget's touchend events - * @param {Object} event The document's touchend event - */ - mouseProto._touchEnd = function (event) { - - // Ignore event if not handled - if (!touchHandled) { - return; - } - - // Simulate the mouseup event - simulateMouseEvent(event, 'mouseup'); - - // Simulate the mouseout event - simulateMouseEvent(event, 'mouseout'); - - // If the touch interaction did not move, it should trigger a click - if (!this._touchMoved) { - - // Simulate the click event - simulateMouseEvent(event, 'click'); - } - - // Unset the flag to allow other widgets to inherit the touch event - touchHandled = false; - }; - - /** - * A duck punch of the $.ui.mouse _mouseInit method to support touch events. - * This method extends the widget with bound touch event handlers that - * translate touch events to mouse events and pass them to the widget's - * original mouse event handling methods. - */ - mouseProto._mouseInit = function () { - - var self = this; - - // Delegate the touch handlers to the widget's element - self.element.bind({ - touchstart: $.proxy(self, '_touchStart'), - touchmove: $.proxy(self, '_touchMove'), - touchend: $.proxy(self, '_touchEnd') - }); - - // Call the original $.ui.mouse init method - _mouseInit.call(self); - }; - - /** - * Remove the touch event handlers - */ - mouseProto._mouseDestroy = function () { - - var self = this; - - // Delegate the touch handlers to the widget's element - self.element.unbind({ - touchstart: $.proxy(self, '_touchStart'), - touchmove: $.proxy(self, '_touchMove'), - touchend: $.proxy(self, '_touchEnd') - }); - - // Call the original $.ui.mouse destroy method - _mouseDestroy.call(self); - }; - -})(jQuery); \ No newline at end of file +!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery); \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/readmore.min.js'. Fisheye: No comparison available. Pass `N' to diff?