Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r915129e3bb3a93900f4098aee480629c55d752e9 -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 915129e3bb3a93900f4098aee480629c55d752e9) +++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -29,7 +29,6 @@ msg.no.instruction =No instruction available. label.authoring.heading.advance.desc =Please input advance options for shared resources label.authoring.basic.title =Title -label.learning.comment.or.instruction =Comment/Instruction label.authoring.basic.add.url =Add URL label.authoring.basic.add.image =Add Image label.authoring.basic.image.list =Image List @@ -66,25 +65,10 @@ label.authoring.up =Move Up label.authoring.down =Move down label.authoring.image =Image -label.description =Description: authoring.exception =There is a problem in shared resources authoring page, the reason is {0} -error.resource.item.title.blank =Title can not be blank. -error.resource.image.not.alowed.format =Allowed file formats: gif, png, jpg -error.resource.item.url.blank =URL can not be blank. -error.resource.item.file.blank =File can not be blank. -error.resource.item.invalid.url =Invalid URL format. -error.upload.failed =Upload file failed: {0} -error.msg.upload.file.not.found =Could not find upload file {0}. -error.msg.zip.file.exception =Could not handle zip file when uploading file. -error.msg.file.not.found =File not found exception occurs when uploading file. -error.msg.ims.application =ImscpApplicationException occurs when uploading original size image. -error.msg.io.exception =IOException occurs when uploading file. -error.msg.repository.checked.exception =Repository checked exception occurs when creating a smaller scale image. -error.msg.item.not.found.exception =Item not found exception occurs when creating a smaller scale image. -error.msg.file.exception =File exception occurs when creating a smaller scale image. -error.msg.invaid.param.upload =InvalidParameterException occured while trying to upload File. -error.msg.default.content.not.find =Could not retrieve default content record for this tool. authoring.msg.cancel.save =Do you want to close this window without saving? +label.learning.comment.or.instruction =Comment/Instruction +label.learning.add.new.image =Add new image label.learning.title =Share Resource Learning label.learning.heading =Share Resources label.resoruce.to.review =Resources to view @@ -93,6 +77,11 @@ label.suggest.new =Suggest a new label.learning.new.file =New file details: label.learning.new.url =New URL details: +label.learning.ratings =ratings +label.learning.add.comment =Add comment +label.learning.post =Post +label.learning.by =By +label.learning.comments =Comments monitoring.tab.summary =Summary monitoring.tab.statistics =Statistic monitoring.tab.edit.activity =Edit Activity @@ -111,10 +100,27 @@ label.monitoring.edit.activity.update =Update label.monitoring.edit.activity.edit =Edit message.monitoring.edit.activity.not.editable =This Activity is no longer editable +label.description =Description: export.label.resource =Resource export.label.no.learning.object =No offline package available export.title =Export portfolio of Share Resource export.init.resource =Initial Resources +error.resource.item.title.blank =Title can not be blank. +error.resource.image.not.alowed.format =Allowed file formats: gif, png, jpg +error.resource.item.url.blank =URL can not be blank. +error.resource.item.file.blank =File can not be blank. +error.resource.item.invalid.url =Invalid URL format. +error.upload.failed =Upload file failed: {0} +error.msg.upload.file.not.found =Could not find upload file {0}. +error.msg.zip.file.exception =Could not handle zip file when uploading file. +error.msg.file.not.found =File not found exception occurs when uploading file. +error.msg.ims.application =ImscpApplicationException occurs when uploading original size image. +error.msg.io.exception =IOException occurs when uploading file. +error.msg.repository.checked.exception =Repository checked exception occurs when creating a smaller scale image. +error.msg.item.not.found.exception =Item not found exception occurs when creating a smaller scale image. +error.msg.file.exception =File exception occurs when creating a smaller scale image. +error.msg.invaid.param.upload =InvalidParameterException occured while trying to upload File. +error.msg.default.content.not.find =Could not retrieve default content record for this tool. errors.header = errors.footer = error.valueReqd =Value Required @@ -190,6 +196,6 @@ admin.success =Configuration successfully saved. admin.return =Return to maintain LAMS admin.button.save =Save +label.default.user.name =Instructor - #======= End labels: Exported 166 labels for en AU ===== Index: lams_tool_images/conf/xdoclet/struts-actions.xml =================================================================== diff -u -r915129e3bb3a93900f4098aee480629c55d752e9 -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 915129e3bb3a93900f4098aee480629c55d752e9) +++ lams_tool_images/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -159,32 +159,39 @@ parameter="finish" > - - + - - + + - - - - + parameter="showComments"> + + + + + + ImageComment. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.imageGallery.model.ImageComment + */ +public interface ImageCommentDAO extends DAO { + +} + \ No newline at end of file Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemVisitDAO.java =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemVisitDAO.java (.../ImageGalleryItemVisitDAO.java) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/ImageGalleryItemVisitDAO.java (.../ImageGalleryItemVisitDAO.java) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; -import org.lamsfoundation.lams.tool.imageGallery.dto.Summary; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItemVisitLog; public interface ImageGalleryItemVisitDAO extends DAO { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java =================================================================== diff -u --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java (revision 0) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageCommentDAOHibernate.java (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -0,0 +1,38 @@ +/**************************************************************** + * 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.tool.imageGallery.dao.hibernate; + +import org.lamsfoundation.lams.tool.imageGallery.dao.ImageCommentDAO; + +/** + * Hibernate implementation of ImageCommentDAO. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.imageGallery.dao.ImageCommentDAO + */ +public class ImageCommentDAOHibernate extends BaseDAOHibernate implements ImageCommentDAO{ + + +} + \ No newline at end of file Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java (.../ImageGalleryItemVisitDAOHibernate.java) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dao/hibernate/ImageGalleryItemVisitDAOHibernate.java (.../ImageGalleryItemVisitDAOHibernate.java) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -23,18 +23,14 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.imageGallery.dao.hibernate; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryItemVisitDAO; -import org.lamsfoundation.lams.tool.imageGallery.dto.Summary; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery; -import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItemVisitLog; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession; -import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser; public class ImageGalleryItemVisitDAOHibernate extends BaseDAOHibernate implements ImageGalleryItemVisitDAO{ Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java =================================================================== diff -u -r2ded08a63789390122f15ab1c3c70075ed0d2a2e -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java (.../Summary.java) (revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java (.../Summary.java) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -24,12 +24,7 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.imageGallery.dto; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem; -import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryWebUtils; /** * List contains following element:
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml =================================================================== diff -u -r915129e3bb3a93900f4098aee480629c55d752e9 -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision 915129e3bb3a93900f4098aee480629c55d752e9) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -22,6 +22,7 @@ org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryUser.hbm.xml org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.hbm.xml org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml + org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.hbm.xml org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItemVisitLog.hbm.xml org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml org/lamsfoundation/lams/tool/imageGallery/model/ImageGallerySession.hbm.xml @@ -41,6 +42,11 @@ + + + + + Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.hbm.xml =================================================================== diff -u --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.hbm.xml (revision 0) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.hbm.xml (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.java =================================================================== diff -u --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.java (revision 0) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageComment.java (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -0,0 +1,136 @@ +/**************************************************************** + * 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.tool.imageGallery.model; + +import java.util.Date; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.log4j.Logger; + +/** + * ImageComment + * + * @author Andrey Balan + * + * @hibernate.class table="tl_laimag10_image_comment" + */ +public class ImageComment implements Cloneable { + + private static final Logger log = Logger.getLogger(ImageComment.class); + + private Long uid; + private String comment; + private ImageGalleryUser createBy; + private Date createDate; + + // ********************************************************** + // Function method for TaskListItemComment + // ********************************************************** + + public Object clone() { + ImageComment imageComment = null; + try { + imageComment = (ImageComment) super.clone(); + ((ImageComment) imageComment).setUid(null); + + // clone ImageGalleryUser as well + if (this.createBy != null) { + imageComment.setCreateBy((ImageGalleryUser) this.createBy.clone()); + } + } catch (CloneNotSupportedException e) { + log.error("When clone " + ImageComment.class + " failed"); + } + + return imageComment; + } + + public boolean equals(Object o) { + if (this == o) + return true; + if (!(o instanceof ImageComment)) + return false; + + final ImageComment genericEntity = (ImageComment) o; + + return new EqualsBuilder().append(this.uid, genericEntity.uid).append(this.comment, genericEntity.comment) + .append(this.createBy, genericEntity.createBy).isEquals(); + } + + public int hashCode() { + return new HashCodeBuilder().append(uid).append(comment).append(createBy).toHashCode(); + } + + // ********************************************************** + // Get/Set methods + // ********************************************************** + + /** + * @hibernate.property column="create_date" + * @return + */ + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + /** + * @hibernate.id generator-class="native" type="java.lang.Long" column="uid" + * @return Returns the log Uid. + */ + public Long getUid() { + return uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + /** + * @hibernate.many-to-one column="create_by" cascade="none" + * @return + */ + public ImageGalleryUser getCreateBy() { + return createBy; + } + + public void setCreateBy(ImageGalleryUser createBy) { + this.createBy = createBy; + } + + /** + * @hibernate.property column="comment" type="text" + * @return + */ + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } +} Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java =================================================================== diff -u -r2ded08a63789390122f15ab1c3c70075ed0d2a2e -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision 2ded08a63789390122f15ab1c3c70075ed0d2a2e) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java (.../ImageGallery.java) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -104,8 +104,6 @@ // *************** NON Persist Fields ******************** private IToolContentHandler toolContentHandler; - private String miniViewNumberStr; - private List onlineFileList; private List offlineFileList; @@ -531,19 +529,6 @@ this.allowVote = allowVote; } - /** - * For display use - * - * @return - */ - public String getMiniViewNumberStr() { - return miniViewNumberStr; - } - - public void setMiniViewNumberStr(String minViewNumber) { - miniViewNumberStr = minViewNumber; - } - public List getOfflineFileList() { return offlineFileList; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml =================================================================== diff -u -r915129e3bb3a93900f4098aee480629c55d752e9 -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml (.../ImageGalleryItem.hbm.xml) (revision 915129e3bb3a93900f4098aee480629c55d752e9) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml (.../ImageGalleryItem.hbm.xml) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -132,6 +132,26 @@ column="file_name" /> + + + + + + + + + o)b+=4.S(4.L(i));4.X=4.A;4.13=4.G;4.A=o;4.G=n;z b},1i:9(p,a){6(4.Q||4.14)z;4.14=1h;8 b=4;8 c=9(){b.14=F;6(p==0)b.t.y(b.E,0);6(b.5.B==\'1Z\'||b.5.B==\'G\'||b.5.u==7||b.G=4.5.u)n=4.O!=7&&!4.W}6(p==J||p==7){8 p=!4.Q&&4.5.u!==0&&((4.5.B&&4.5.B!=\'G\')||4.A>1);6(!4.Q&&(!4.5.B||4.5.B==\'G\')&&4.5.u!=7&&4.A==1)p=4.O!=7&&4.W}8 a=4;4.U[n?\'1u\':\'22\'](4.5.2m,4.2G)[n?\'1E\':\'V\'](4.K(\'C-17-1w\')).1J(\'1w\',n?F:1h);4.R[p?\'1u\':\'22\'](4.5.2k,4.2b)[p?\'1E\':\'V\'](4.K(\'C-11-1w\')).1J(\'1w\',p?F:1h);6(4.U.I>0&&(4.U[0].1g==J||4.U[0].1g!=n)&&4.5.1O!=7){4.U.1b(9(){a.5.1O(a,4,n)});4.U[0].1g=n}6(4.R.I>0&&(4.R[0].1g==J||4.R[0].1g!=p)&&4.5.1L!=7){4.R.1b(9(){a.5.1L(a,4,p)});4.R[0].1g=p}},1M:9(a){8 b=4.X==7?\'2a\':(4.X<4.A?\'17\':\'11\');4.12(\'2F\',a,b);6(4.X!==4.A){4.12(\'2B\',a,b,4.A);4.12(\'2z\',a,b,4.X)}6(4.13!==4.G){4.12(\'2x\',a,b,4.G);4.12(\'2v\',a,b,4.13)}4.12(\'2s\',a,b,4.A,4.G,4.X,4.13);4.12(\'2p\',a,b,4.X,4.13,4.A,4.G)},12:9(a,b,c,d,e,f,g){6(4.5[a]==J||(1R 4.5[a]!=\'2h\'&&b!=\'2i\'))z;8 h=1R 4.5[a]==\'2h\'?4.5[a][b]:4.5[a];6(!$.2W(h))z;8 j=4;6(d===J)h(j,c,b);10 6(e===J)4.L(d).1b(9(){h(j,4,d,c,b)});10{1r(8 i=d;i<=e;i++)6(i!==7&&!(i>=f&&i<=g))4.L(i).1b(9(){h(j,4,i,c,b)})}},1B:9(i){z 4.1I(\'<1F>\',i)},1I:9(e,i){8 a=$(e).V(4.K(\'C-1a\')).V(4.K(\'C-1a-\'+i));a.1J(\'2V\',i);z a},K:9(c){z c+\' \'+c+(!4.5.Z?\'-2U\':\'-Z\')},S:9(e,d){8 a=e.2g!=J?e[0]:e;8 b=!4.5.Z?a.1x+r.Y(a,\'2f\')+r.Y(a,\'1l\'):a.2e+r.Y(a,\'2d\')+r.Y(a,\'1N\');6(d==J||b==d)z b;8 w=!4.5.Z?d-r.Y(a,\'2f\')-r.Y(a,\'1l\'):d-r.Y(a,\'2d\')-r.Y(a,\'1N\');$(a).y(4.N,w+\'T\');z 4.S(a)},1m:9(){z!4.5.Z?4.H[0].1x-r.M(4.H.y(\'2T\'))-r.M(4.H.y(\'2S\')):4.H[0].2e-r.M(4.H.y(\'2R\'))-r.M(4.H.y(\'3i\'))},2P:9(i,s){6(s==J)s=4.5.u;z 1k.2O((((i-1)/s)-1k.2N((i-1)/s))*s)+1}});r.16({3m:9(d){z $.16(q,d||{})},Y:9(e,p){6(!e)z 0;8 a=e.2g!=J?e[0]:e;6(p==\'1l\'&&$.2A.28){8 b={\'1y\':\'1A\',\'2M\':\'2L\',\'1H\':\'1q\'},1Y,1W;$.29(a,b,9(){1Y=a.1x});b[\'1l\']=0;$.29(a,b,9(){1W=a.1x});z 1W-1Y}z r.M($.y(a,p))},M:9(v){v=2K(v);z 2J(v)?0:v}})})(3v);',62,218,'||||this|options|if|null|var|function||||||||||||||||||||list|size||||css|return|first|wrap|jcarousel|container|lt|false|last|clip|length|undefined|className|get|intval|wh|tail|div|locked|buttonPrev|dimension|px|buttonNext|addClass|inTail|prevFirst|margin|vertical|else|prev|callback|prevLast|animating|visible|extend|next|circular|parent|item|each|scroll|timer|split|buttons|jcarouselstate|true|animate|initCallback|Math|marginRight|clipping|while|hasClass|break|auto|for|pos|setup|bind|fn|disabled|offsetWidth|display|before|block|create|stopAuto|placeholder|removeClass|li|reloadCallback|width|format|attr|animation|buttonPrevCallback|notify|marginBottom|buttonNextCallback|ceil|buttonPrevHTML|typeof|buttonNextHTML|scrollTail|funcResize|remove|oWidth2|after|oWidth|both|old|offset|unbind|top|left|start|height|window|safari|swap|init|funcPrev|easing|marginTop|offsetHeight|marginLeft|jquery|object|onAfterAnimation|startAuto|buttonPrevEvent|click|buttonNextEvent|ol|ul|itemVisibleOutCallback|reload|prepend|itemVisibleInCallback|nodeName|add|itemLastOutCallback|skin|itemLastInCallback|indexOf|itemFirstOutCallback|browser|itemFirstInCallback|empty|reset|resize|itemLoadCallback|funcNext|prototype|load|isNaN|parseInt|none|float|floor|round|index|swing|borderTopWidth|borderRightWidth|borderLeftWidth|horizontal|jcarouselindex|isFunction|normal|clearTimeout|1000|setTimeout|onBeforeAnimation|children|push|Aborting|loop|infinite|an|cause|will|This|items|set|No|jCarousel|alert|class|find|borderBottomWidth|append|html|string|defaults|OL|UL|new|has|unlock|lock|10px|0px|jQuery'.split('|'),0,{})) Index: lams_tool_images/web/includes/javascript/jquery.rating.pack.js =================================================================== diff -u --- lams_tool_images/web/includes/javascript/jquery.rating.pack.js (revision 0) +++ lams_tool_images/web/includes/javascript/jquery.rating.pack.js (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -0,0 +1,11 @@ +/* + ### jQuery Star Rating Plugin v2.5 - 2008-09-10 ### + * http://www.fyneworks.com/ - diego@fyneworks.com + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + ### + Project: http://plugins.jquery.com/project/MultipleFriendlyStarRating + Website: http://www.fyneworks.com/jquery/star-rating/ +*/ +eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';6(13.H)(7($){$.3={q:\'14 15\',I:\'\',h:0,J:16,5:{},8:{x:7(n,a,b,c){4.j(n);$(a).K(\'.r\'+n).L().k(\'17\'+(c||\'M\'));g d=$(a).s(\'a\');9=d.t();6(b.N)b.N.y($.3.5[n].e[0],[9,d[0]])},j:7(n,a,b){$.3.5[n].e.18(\'.r\'+n).z(\'u\').z(\'19\')},m:7(n,a,b){6(!$($.3.5[n].o).1a(\'.q\'))$($.3.5[n].o).K(\'.r\'+n).L().k(\'u\');g c=$(a).s(\'a\');9=c.t();6(b.O)b.O.y($.3.5[n].e[0],[9,c[0]])},p:7(n,a,b){$.3.5[n].o=a;g c=$(a).s(\'a\');9=c.t();$.3.5[n].e.9(9);$.3.8.j(n,a,b);$.3.8.m(n,a,b);6(b.P)b.P.y($.3.5[n].e[0],[9,c[0]])}}};$.Q.3=7(d){6(4.R==0)A 4;d=$.S({},$.3,d||{});4.1b(7(i){g a=$.S({},d||{},($.T?$(4).T():($.1c?$(4).1d():1e))||{});g n=(4.U||\'1f-3\').1g(/\\[|\\]/,"1h");6(!$.3.5[n])$.3.5[n]={B:0};i=$.3.5[n].B;$.3.5[n].B++;$.3.5[n].l=$.3.5[n].l||a.l||$(4).1i(\'C\');6(i==0){$.3.5[n].e=$(\'\');$(4).X($.3.5[n].e);6($.3.5[n].l||a.1k){}Y{$(4).X($(\'\'+a.I+\'\').10(7(){$.3.8.j(n,4,a);$(4).k(\'u\')}).11(7(){$.3.8.m(n,4,a);$(4).z(\'u\')}).p(7(){$.3.8.p(n,4,a)}))}};f=$(\'\'+4.D+\'\');$(4).1l(f);6(a.1m)a.h=2;6(1n a.h==\'1o\'&&a.h>0){g b=($.Q.F?$(f).F():0)||a.J;g c=(i%a.h),G=1p.1q(b/a.h);$(f).F(G).1r(\'a\').1s({\'1t-1u\':\'-\'+(c*G)+\'1v\'})};$(f).k(\'r\'+n);6($.3.5[n].l)$(f).k(\'1w\');Y $(f).k(\'1x\').10(7(){$.3.8.j(n,4,a);$.3.8.x(n,4,a,\'M\')}).11(7(){$.3.8.j(n,4,a);$.3.8.m(n,4,a)}).p(7(){$.3.8.p(n,4,a)});6(4.1y)$.3.5[n].o=f;$(4).1z();6(i+1==4.R)$.3.8.m(n,4,a)});1A(n 1B $.3.5)(7(c,v,n){6(!c)A;$.3.8.x(n,c,d||{},\'1C\');$(v).9($(c).s(\'a\').t())})($.3.5[n].o,$.3.5[n].e,n);A 4};$(7(){$(\'V[@W=1D].12\').3()})})(H);',62,102,'|||rating|this|groups|if|function|event|val|||||valueElem|eStar|var|split||drain|addClass|readOnly|reset||current|click|cancel|star_group_|children|text|star_on||div|fill|apply|removeClass|return|count|disabled|value|title|width|spw|jQuery|cancelValue|starWidth|prevAll|andSelf|hover|focus|blur|callback|fn|length|extend|metadata|name|input|type|before|else|class|mouseover|mouseout|star|window|Cancel|Rating||star_|siblings|star_hover|is|each|meta|data|null|unnamed|replace|_|attr|hidden|required|after|half|typeof|number|Math|floor|find|css|margin|left|px|star_readonly|star_live|checked|remove|for|in|on|radio'.split('|'),0,{})) \ No newline at end of file Fisheye: Tag fd6a44adca1e0d4ee031b0b8b442de4ee8974d74 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learning/addfile.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/web/pages/learning/addimage.jsp =================================================================== diff -u --- lams_tool_images/web/pages/learning/addimage.jsp (revision 0) +++ lams_tool_images/web/pages/learning/addimage.jsp (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -0,0 +1,46 @@ + + +<%@ include file="/common/taglibs.jsp"%> + + + <%@ include file="/common/header.jsp"%> + + + + + + + +
+ +
+ + <%@ include file="/common/messages.jsp"%> + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + + Fisheye: Tag fd6a44adca1e0d4ee031b0b8b442de4ee8974d74 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learning/addurl.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/web/pages/learning/learning.jsp =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/web/pages/learning/learning.jsp (.../learning.jsp) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/web/pages/learning/learning.jsp (.../learning.jsp) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -12,37 +12,108 @@ - - + + + + + + + + + + + + + -
-

+
+

${imageGallery.title}

@@ -90,127 +180,118 @@ <%@ include file="/common/messages.jsp"%> + + + - - - - - - - - - - - - - - - - +
+
+ Description +
+
+ +
+ + + + + +
+

+ 15 +

+
+ + + + + + + -
- - - -
- - ${item.title} + - - [${item.createBy.loginName}] - - - - - - - - - - - -
- ${imageGallery.miniViewNumberStr} -
+ +
+ + + + + +
+
+ - -

- -

- - - + + + -

- -

-
- - - - | - - - - - - - - - - - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ <%@ include file="/pages/learning/parts/commentsarea.jsp"%> +
+ + + + - - - - - - - - - - - - - <%-- end mode != teacher --%> - - -

@@ -241,18 +322,18 @@ -
+
+ onclick="return continueReflect()" styleClass="button" > + onclick="return finishSession()" styleClass="button" > @@ -269,3 +350,4 @@ + Index: lams_tool_images/web/pages/learning/parts/commentlist.jsp =================================================================== diff -u --- lams_tool_images/web/pages/learning/parts/commentlist.jsp (revision 0) +++ lams_tool_images/web/pages/learning/parts/commentlist.jsp (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -0,0 +1,41 @@ + + +
+ +
+ + + + +
+ + + + + + + + + + + + + +
+ + + + + + + + ${author} + - + +
+
+ +
+
+ + Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp =================================================================== diff -u --- lams_tool_images/web/pages/learning/parts/commentsarea.jsp (revision 0) +++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -0,0 +1,31 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + <%@ include file="commentlist.jsp"%> + + +
+ +
+ + +
+ + + + + + + +
+
+ + + + + Index: lams_tool_images/web/pages/learning/start.jsp =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/web/pages/learning/start.jsp (.../start.jsp) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/web/pages/learning/start.jsp (.../start.jsp) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -5,18 +5,8 @@ - - - - - - - - - + Fisheye: Tag fd6a44adca1e0d4ee031b0b8b442de4ee8974d74 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learningobj/defaultcontent.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fd6a44adca1e0d4ee031b0b8b442de4ee8974d74 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learningobj/icons/.cvsignore'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/web/pages/learningobj/icons/base.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/empty.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/folder.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/folderopen.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/join.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/joinbottom.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/line.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/minus.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/minusbottom.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/page.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/plus.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Index: lams_tool_images/web/pages/learningobj/icons/plusbottom.gif =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 Binary files differ Fisheye: Tag fd6a44adca1e0d4ee031b0b8b442de4ee8974d74 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learningobj/mainframe.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fd6a44adca1e0d4ee031b0b8b442de4ee8974d74 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learningobj/navigatortree.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fd6a44adca1e0d4ee031b0b8b442de4ee8974d74 refers to a dead (removed) revision in file `lams_tool_images/web/pages/learningobj/xmltree.xsl'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -23,8 +23,8 @@ selectTab(tabId); } - function viewItem(itemUid,sessionMapID){ - var myUrl = "?mode=teacher&itemUid=" + itemUid + "&sessionMapID="+sessionMapID; + function viewItem(imageUid,sessionMapID){ + var myUrl = "?mode=teacher&imageUid=" + imageUid + "&sessionMapID="+sessionMapID; launchPopup(myUrl,"MonitoringReview"); } Index: lams_tool_images/web/pages/monitoring/statistic.jsp =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/web/pages/monitoring/statistic.jsp (.../statistic.jsp) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -75,7 +75,7 @@ - + ${item.viewNumber} Index: lams_tool_images/web/pages/monitoring/summary.jsp =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rfd6a44adca1e0d4ee031b0b8b442de4ee8974d74 --- lams_tool_images/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision fd6a44adca1e0d4ee031b0b8b442de4ee8974d74) @@ -223,7 +223,7 @@ - + ${item.viewNumber} @@ -235,10 +235,10 @@ - + - +