You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <fg...@us...> - 2010-09-11 10:27:18
|
Revision: 3045 http://openutils.svn.sourceforge.net/openutils/?rev=3045&view=rev Author: fgiust Date: 2010-09-11 10:27:12 +0000 (Sat, 11 Sep 2010) Log Message: ----------- increase scrollablecontent initial height Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-11 08:23:21 UTC (rev 3044) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-11 10:27:12 UTC (rev 3045) @@ -444,5 +444,5 @@ #scrollablecontent { overflow-y: scroll; - height: 300px; + height: 600px; } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <df...@us...> - 2010-09-11 08:23:28
|
Revision: 3044 http://openutils.svn.sourceforge.net/openutils/?rev=3044&view=rev Author: dfghi Date: 2010-09-11 08:23:21 +0000 (Sat, 11 Sep 2010) Log Message: ----------- MEDIA-171 Moved zip importer configuration to to no-overwrite folder, so the user can keep his own configuration. Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.zipimporter.xml Removed Paths: ------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml 2010-09-11 05:06:57 UTC (rev 3043) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.config.zipimporter.xml 2010-09-11 08:23:21 UTC (rev 3044) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="zipimporter" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>7a187c96-87ac-4ca4-8669-ac75911b34f4</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlmedia.media.zip.DefaultZipImporter</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2010-08-31T16:34:22.420+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-08-31T16:35:13.535+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.zipimporter.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.zipimporter.xml (rev 0) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.zipimporter.xml 2010-09-11 08:23:21 UTC (rev 3044) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="zipimporter" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>7a187c96-87ac-4ca4-8669-ac75911b34f4</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlmedia.media.zip.DefaultZipImporter</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-08-31T16:34:22.420+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-08-31T16:35:13.535+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.zipimporter.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-11 05:07:03
|
Revision: 3043 http://openutils.svn.sourceforge.net/openutils/?rev=3043&view=rev Author: diego_schivo Date: 2010-09-11 05:06:57 +0000 (Sat, 11 Sep 2010) Log Message: ----------- MEDIA-174 nodedata removed Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2010-09-11 05:01:18 UTC (rev 3042) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2010-09-11 05:06:57 UTC (rev 3043) @@ -159,9 +159,6 @@ <sv:property sv:name="label" sv:type="String"> <sv:value>config.search.filters.searchin</sv:value> </sv:property> - <sv:property sv:name="properties" sv:type="String"> - <sv:value>title,tags</sv:value> - </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:metaData</sv:value> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-11 05:01:24
|
Revision: 3042 http://openutils.svn.sourceforge.net/openutils/?rev=3042&view=rev Author: diego_schivo Date: 2010-09-11 05:01:18 +0000 (Sat, 11 Sep 2010) Log Message: ----------- MEDIA-179 the media name could be lowercase at saving Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-09-11 04:44:44 UTC (rev 3041) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-09-11 05:01:18 UTC (rev 3042) @@ -143,6 +143,8 @@ String filename = getFilename(media); int p = StringUtils.lastIndexOf(filename, '/'); String name = p != -1 ? filename.substring(p + 1) : filename; + // lowercase at saving for case insensitive sorting + name = StringUtils.lowerCase(name); if (!StringUtils.equals(name, NodeDataUtil.getString(media, METADATA_NAME))) { NodeDataUtil.getOrCreateAndSet(media, METADATA_NAME, name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-11 04:44:50
|
Revision: 3041 http://openutils.svn.sourceforge.net/openutils/?rev=3041&view=rev Author: diego_schivo Date: 2010-09-11 04:44:44 +0000 (Sat, 11 Sep 2010) Log Message: ----------- MEDIA-179 Sorting options Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-09-10 16:18:03 UTC (rev 3040) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-09-11 04:44:44 UTC (rev 3041) @@ -110,6 +110,11 @@ media.sorting.creationdate=Creation date media.sorting.title=Title +media.sorting.date.asc=Date, older first +media.sorting.date.desc=Date, newer first +media.sorting.name.asc=Name A-Z +media.sorting.name.desc=Name Z-A + stk.dam.mediauuid.description=Select or create a new media stk.dam.mediauuid.label=Select media Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-09-10 16:18:03 UTC (rev 3040) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-09-11 04:44:44 UTC (rev 3041) @@ -113,6 +113,11 @@ media.sorting.creationdate=Data di creazione media.sorting.title=Titolo +media.sorting.date.asc=Data, dal meno recente +media.sorting.date.desc=Data, dal pi\u00F9 recente +media.sorting.name.asc=Nome A-Z +media.sorting.name.desc=Nome Z-A + stk.dam.mediauuid.description=Seleziona o carica un nuovo media stk.dam.mediauuid.label=Seleziona media Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 16:18:03 UTC (rev 3040) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-11 04:44:44 UTC (rev 3041) @@ -370,9 +370,10 @@ [#if this.request.requestURI?ends_with('/media-advsearch.html')] <option value="score"[#if this.sorting == 'score'] selected="selected"[/#if]>${this.msgs.get('media.sorting.score')}</option> [/#if] - <option value="creationdate"[#if this.sorting == 'creationdate'] selected="selected"[/#if]>${this.msgs.get('media.sorting.creationdate')}</option> - <option value="name"[#if this.sorting == 'name'] selected="selected"[/#if]>${this.msgs.get('media.sorting.name')}</option> - <option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>${this.msgs.get('media.sorting.title')}</option> + <option value="CREATIONDATE_ASC"[#if this.sorting == 'CREATIONDATE_ASC'] selected="selected"[/#if]>${this.msgs.get('media.sorting.date.asc')}</option> + <option value="CREATIONDATE_DESC"[#if this.sorting == 'CREATIONDATE_DESC'] selected="selected"[/#if]>${this.msgs.get('media.sorting.date.desc')}</option> + <option value="FILENAME_ASC"[#if this.sorting == 'FILENAME_ASC'] selected="selected"[/#if]>${this.msgs.get('media.sorting.name.asc')}</option> + <option value="FILENAME_DESC"[#if this.sorting == 'FILENAME_DESC'] selected="selected"[/#if]>${this.msgs.get('media.sorting.name.desc')}</option> </select> </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 16:18:09
|
Revision: 3040 http://openutils.svn.sourceforge.net/openutils/?rev=3040&view=rev Author: diego_schivo Date: 2010-09-10 16:18:03 +0000 (Fri, 10 Sep 2010) Log Message: ----------- ie-fix.css Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-10 16:14:19 UTC (rev 3039) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-10 16:18:03 UTC (rev 3040) @@ -20,3 +20,8 @@ .paging { margin-right: 0; } + +/* increase vertical spacing */ +#navigation .sortingcontainer { + padding-top: 8px; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 16:14:26
|
Revision: 3039 http://openutils.svn.sourceforge.net/openutils/?rev=3039&view=rev Author: diego_schivo Date: 2010-09-10 16:14:19 +0000 (Fri, 10 Sep 2010) Log Message: ----------- css refactoring Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 16:11:13 UTC (rev 3038) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 16:14:19 UTC (rev 3039) @@ -103,6 +103,11 @@ visibility: hidden; } +#navigation .sortingcontainer { + margin-right: 10px; + padding-top: 3px; +} + .voice a,.voice a:visited,.voice a:hover { text-decoration: none; color: #333; Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 16:11:13 UTC (rev 3038) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 16:14:19 UTC (rev 3039) @@ -365,7 +365,7 @@ <div class="voice right"> <a name="pagesize1" href="#" class="pagesize-selector size1 [#if this.pagesizeSelector == 'size1']size1-active[/#if]"><!-- --></a> </div> - <div class="voice right" style="margin-right: 10px; padding-top: 3px;"> + <div class="voice right sortingcontainer"> <select id="sorting" name="sorting"> [#if this.request.requestURI?ends_with('/media-advsearch.html')] <option value="score"[#if this.sorting == 'score'] selected="selected"[/#if]>${this.msgs.get('media.sorting.score')}</option> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 16:11:19
|
Revision: 3038 http://openutils.svn.sourceforge.net/openutils/?rev=3038&view=rev Author: diego_schivo Date: 2010-09-10 16:11:13 +0000 (Fri, 10 Sep 2010) Log Message: ----------- ie-fix.css Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-10 16:02:43 UTC (rev 3037) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-10 16:11:13 UTC (rev 3038) @@ -9,4 +9,14 @@ .menupopup a span { word-wrap: break-word; -} \ No newline at end of file +} + +/* prevent paginator falling */ +#navigation #bgselectorblock { + width: 280px; +} + +/* margin included in width above */ +.paging { + margin-right: 0; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2010-09-10 16:02:49
|
Revision: 3037 http://openutils.svn.sourceforge.net/openutils/?rev=3037&view=rev Author: fgiust Date: 2010-09-10 16:02:43 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-179 don't crash on invalid sort parameters Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:42:15 UTC (rev 3036) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 16:02:43 UTC (rev 3037) @@ -172,8 +172,16 @@ } bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white"); pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1"); - if (sorting == null || SortMode.valueOf(sorting) == null) + + try { + if (sorting == null || SortMode.valueOf(sorting) == null) + { + sorting = getDefaultSorting().name(); + } + } + catch (IllegalArgumentException e) + { sorting = getDefaultSorting().name(); } // for activation status handling This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 15:42:21
|
Revision: 3036 http://openutils.svn.sourceforge.net/openutils/?rev=3036&view=rev Author: diego_schivo Date: 2010-09-10 15:42:15 +0000 (Fri, 10 Sep 2010) Log Message: ----------- fixNavWidth no more needed Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 15:32:55 UTC (rev 3035) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 15:42:15 UTC (rev 3036) @@ -28,8 +28,6 @@ initialize: function(options){ this.setOptions(options); - if (Browser.Engine.name == 'trident' && Browser.Engine.version == 4) this.fixNavWidthIE6(); - else this.fixNavWidth(); window.addEvent('resize', this.layout); this.layout(); new mooSelecta({ @@ -42,29 +40,6 @@ new MediaFolderView.InfoTooltips('li.media .image'); }, - fixNavWidth: function(){ - var nav = $('navigation'); - if (nav) nav.setStyle('min-width', (this.calcTotWidth(nav.getElements('.voice')) + 20) + 'px'); - }, - - fixNavWidthIE6: function(){ - var nav = $('navigation'); - if (!nav) return; - var tabs = nav.getElements('.mediatab'); - $('bgselectorblock').setStyles({float: 'none', position: 'absolute', right: 0, top: 0}); - new Element('div', {styles: {float: 'left', width: (this.calcTotWidth(nav.getElements('.voice')) + 20) + 'px'}}) - .adopt(nav.getElements('.mediatab')) - .inject(nav); - }, - - calcTotWidth: function(items){ - var w = 0; - items.each(function(item){ - w += item.getSize().x; - }); - return w; - }, - layout: function(){ $('scrollablecontent').setStyle('height', window.getSize().y - 58 + 'px'); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2010-09-10 15:33:01
|
Revision: 3035 http://openutils.svn.sourceforge.net/openutils/?rev=3035&view=rev Author: fgiust Date: 2010-09-10 15:32:55 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-179 handle default sorting Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:29:16 UTC (rev 3034) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:32:55 UTC (rev 3035) @@ -172,7 +172,7 @@ } bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white"); pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1"); - if (SortMode.valueOf(sorting) == null) + if (sorting == null || SortMode.valueOf(sorting) == null) { sorting = getDefaultSorting().name(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2010-09-10 15:29:23
|
Revision: 3034 http://openutils.svn.sourceforge.net/openutils/?rev=3034&view=rev Author: fgiust Date: 2010-09-10 15:29:16 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-179 enum for sorting options Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/SortMode.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-09-10 15:24:05 UTC (rev 3033) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-09-10 15:29:16 UTC (rev 3034) @@ -35,7 +35,7 @@ import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.SearchFilter; import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager; import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule; -import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage; +import net.sourceforge.openutils.mgnlmedia.media.pages.SortMode; import net.sourceforge.openutils.mgnlmedia.media.types.MediaTypeHandler; import org.apache.commons.lang.StringUtils; @@ -103,7 +103,7 @@ } public AdvancedResult search(HttpServletRequest request, String mediaType, String path, boolean descendants, - String sorting, int itemsPerPage, int pageNumberStartingFromOne) + SortMode sorting, int itemsPerPage, int pageNumberStartingFromOne) { Criteria c = JCRCriteriaFactory .createCriteria() @@ -140,22 +140,26 @@ } // sorting - if (MediaFolderViewPage.SORT_BY_SCORE.equals(sorting)) + if (sorting == SortMode.SCORE) { c.addOrder(Order.desc("@jcr:score")); } - else if (MediaFolderViewPage.SORT_BY_CREATIONDATE.equals(sorting)) + else if (sorting == SortMode.CREATIONDATE_ASC) { c.addOrder(Order.asc("@jcr:created")); } - else if (MediaFolderViewPage.SORT_BY_TITLE.equals(sorting)) + else if (sorting == SortMode.CREATIONDATE_DESC) { - c.addOrder(Order.asc("@title")); + c.addOrder(Order.desc("@jcr:created")); } - else if (MediaFolderViewPage.SORT_BY_NAME.equals(sorting)) + else if (sorting == SortMode.FILENAME_ASC) { c.addOrder(Order.asc("@" + MediaTypeHandler.METADATA_NAME)); } + else if (sorting == SortMode.FILENAME_DESC) + { + c.addOrder(Order.desc("@" + MediaTypeHandler.METADATA_NAME)); + } // paging if (itemsPerPage > 0) Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2010-09-10 15:24:05 UTC (rev 3033) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/configuration/MediaConfigurationManager.java 2010-09-10 15:29:16 UTC (rev 3034) @@ -35,11 +35,7 @@ import info.magnolia.context.MgnlContext; import java.util.ArrayList; -import java.util.Calendar; import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -49,7 +45,6 @@ import javax.jcr.query.InvalidQueryException; import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule; -import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage; import org.apache.commons.lang.StringUtils; import org.apache.jackrabbit.util.ISO9075; @@ -198,18 +193,6 @@ } /** - * Get all media nodes in a folder - * @param folder folder - * @return all media nodes - * @deprecated use SearchMediaQueryConfiguration.search(...) - */ - @Deprecated - public Collection<Content> getMediaNodes(Content folder) - { - return getMediaNodes(folder, null, MediaFolderViewPage.SORT_BY_MODIFICATIONDATE); - } - - /** * Get the list of web pages where a media is used * @param uuid uuid of media * @return list of web pages where a media is used @@ -222,122 +205,6 @@ } /** - * Get all media nodes of given type in a folder - * @param folder folder - * @param type media - * @param sorting sorting - * @return all media nodes of passed type - * @deprecated use SearchMediaQueryConfiguration.search(...) - */ - @Deprecated - public Collection<Content> getMediaNodes(final Content folder, final String type, final String sorting) - { - List<Content> medias = (List<Content>) folder.getChildren(new Content.ContentFilter() - { - - /** - * {@inheritDoc} - */ - public boolean accept(Content content) - { - try - { - return content.getItemType().equals(MEDIA) && NodeDataUtil.getString(content, "type").equals(type); - } - catch (RepositoryException e) - { - log.error("Error getting item type on node {} module media", folder.getHandle(), e); - } - return false; - } - - }); - final MediaConfigurationManager mcm = this; - Collections.sort(medias, new Comparator<Content>() - { - - private Map<String, Integer> mapNpages = new HashMap<String, Integer>(); - - /** - * {@inheritDoc} - */ - public int compare(Content o1, Content o2) - { - if (sorting.equals(MediaFolderViewPage.SORT_BY_FILENAME)) - { - return o1.getName().compareTo(o2.getName()); - } - else if (sorting.equals(MediaFolderViewPage.SORT_BY_MODIFICATIONDATE)) - { - Calendar o1c = o1.getMetaData().getModificationDate() == null - ? o1.getMetaData().getCreationDate() - : o1.getMetaData().getModificationDate(); - Calendar o2c = o2.getMetaData().getModificationDate() == null - ? o2.getMetaData().getCreationDate() - : o2.getMetaData().getModificationDate(); - return o1c.compareTo(o2c); - } - else if (sorting.equals(MediaFolderViewPage.SORT_BY_USAGE)) - { - Integer nPages1 = mapNpages.get(o1.getHandle()); - Integer nPages2 = mapNpages.get(o1.getHandle()); - if (nPages1 == null) - { - try - { - nPages1 = mcm.getUsedInWebPages(o1.getUUID()).size(); - } - catch (InvalidQueryException e) - { - nPages1 = 0; - log.error("Exception getting web pages for media {}", o1.getHandle(), e); - } - catch (RepositoryException e) - { - nPages1 = 0; - log.error("Exception getting web pages for media {}", o1.getHandle(), e); - } - mapNpages.put(o1.getHandle(), nPages1); - } - if (nPages2 == null) - { - try - { - nPages2 = mcm.getUsedInWebPages(o2.getUUID()).size(); - } - catch (InvalidQueryException e) - { - nPages2 = 0; - log.error("Exception getting web pages for media {}", o2.getHandle(), e); - } - catch (RepositoryException e) - { - nPages2 = 0; - log.error("Exception getting web pages for media {}", o2.getHandle(), e); - } - mapNpages.put(o2.getHandle(), nPages2); - } - return nPages1.compareTo(nPages2); - } - else - { - try - { - return (o1.getIndex() >= o2.getIndex()) ? 1 : -1; - } - catch (RepositoryException e) - { - return 0; - } - } - } - - }); - - return medias; - } - - /** * Search media * @param text text to search * @param type if specified restricts the search to the type Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-09-10 15:24:05 UTC (rev 3033) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java 2010-09-10 15:29:16 UTC (rev 3034) @@ -98,7 +98,7 @@ return MediaEl .module() .getSearch() - .search(request, type.getName(), "/", true, SORT_BY_SCORE, 0, 1) + .search(request, type.getName(), "/", true, SortMode.SCORE, 0, 1) .getTotalSize(); } @@ -117,18 +117,13 @@ null, null, true, - SORT_BY_SCORE, + SortMode.SCORE, searchConfig.getXmlItemsPerPage(), page); } - return searchConfig.search( - request, - type, - "/", - true, - sorting, - MediaEl.module().getFolderViewItemsPerPage(), - page); + return searchConfig.search(request, type, "/", true, SortMode.valueOf(sorting), MediaEl + .module() + .getFolderViewItemsPerPage(), page); } @Override @@ -195,9 +190,9 @@ * {@inheritDoc} */ @Override - protected String getDefaultSorting() + protected SortMode getDefaultSorting() { - return SORT_BY_SCORE; + return SortMode.SCORE; } public String playlistTitle() Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:24:05 UTC (rev 3033) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:29:16 UTC (rev 3034) @@ -72,41 +72,6 @@ public class MediaFolderViewPage extends MessagesTemplatedMVCHandler { - /** - * - */ - public static final String SORT_BY_NAME = "name"; - - /** - * - */ - public static final String SORT_BY_CREATIONDATE = "creationdate"; - - /** - * - */ - public static final String SORT_BY_FILENAME = "filename"; - - /** - * - */ - public static final String SORT_BY_MODIFICATIONDATE = "modificationdate"; - - /** - * - */ - public static final String SORT_BY_SCORE = "score"; - - /** - * - */ - public static final String SORT_BY_TITLE = "title"; - - /** - * - */ - public static final String SORT_BY_USAGE = "usage"; - protected String path; protected String node; @@ -207,8 +172,10 @@ } bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white"); pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1"); - sorting = StringUtils.defaultIfEmpty(sorting, getDefaultSorting()); - + if (SortMode.valueOf(sorting) == null) + { + sorting = getDefaultSorting().name(); + } // for activation status handling develop = SystemProperty.getBooleanProperty("magnolia.develop"); } @@ -225,14 +192,10 @@ return 0; } // sorting must be specified for total-size to work (-1 otherwise) - AdvancedResult typeResult = MediaEl.module().getSearch().search( - request, - type.getName(), - path, - false, - getDefaultSorting(), - 0, - 1); + AdvancedResult typeResult = MediaEl + .module() + .getSearch() + .search(request, type.getName(), path, false, getDefaultSorting(), 0, 1); return typeResult.getTotalSize(); } @@ -259,7 +222,7 @@ { itemsPerPage = module.getFolderViewItemsPerPage(); } - return module.getSearch().search(request, type, path, false, sorting, itemsPerPage, page); + return module.getSearch().search(request, type, path, false, SortMode.valueOf(sorting), itemsPerPage, page); } /** @@ -852,9 +815,7 @@ public String getMessage(String key, String param) { - return getMsgs().get(key, new String[]{ - param - }); + return getMsgs().get(key, new String[]{param }); } /** @@ -867,9 +828,7 @@ String s = request.getQueryString(); s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s; int p1; - while ((p1 = StringUtils.indexOfAny(s, new String[]{ - "&type=", "&command=", "&page=" - })) != -1) + while ((p1 = StringUtils.indexOfAny(s, new String[]{"&type=", "&command=", "&page=" })) != -1) { int p2 = s.indexOf('&', p1 + 1); s = s.substring(0, p1) + (p2 != -1 ? s.substring(p2) : StringUtils.EMPTY); @@ -888,8 +847,8 @@ return '?' + s + (s.length() > 0 ? '&' : StringUtils.EMPTY) + "type=" + type.getName(); } - protected String getDefaultSorting() + protected SortMode getDefaultSorting() { - return SORT_BY_CREATIONDATE; + return SortMode.FILENAME_ASC; } } Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/SortMode.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/SortMode.java (rev 0) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/SortMode.java 2010-09-10 15:29:16 UTC (rev 3034) @@ -0,0 +1,27 @@ +/** + * + * Magnolia SimpleMedia Module (http://www.openmindlab.com/lab/products/media.html) + * Copyright (C)2008 - 2010, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * 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, see <http://www.gnu.org/licenses/>. + */ +package net.sourceforge.openutils.mgnlmedia.media.pages; + +/** + * @author fgiust + * @version $Id$ + */ +public enum SortMode { + CREATIONDATE_ASC, CREATIONDATE_DESC, FILENAME_ASC, FILENAME_DESC, SCORE; +} Property changes on: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/SortMode.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 15:24:11
|
Revision: 3033 http://openutils.svn.sourceforge.net/openutils/?rev=3033&view=rev Author: diego_schivo Date: 2010-09-10 15:24:05 +0000 (Fri, 10 Sep 2010) Log Message: ----------- layout scrollablecontent Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 15:05:52 UTC (rev 3032) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 15:24:05 UTC (rev 3033) @@ -30,6 +30,8 @@ this.setOptions(options); if (Browser.Engine.name == 'trident' && Browser.Engine.version == 4) this.fixNavWidthIE6(); else this.fixNavWidth(); + window.addEvent('resize', this.layout); + this.layout(); new mooSelecta({ selector: '#sorting' }); @@ -61,7 +63,12 @@ w += item.getSize().x; }); return w; + }, + + layout: function(){ + $('scrollablecontent').setStyle('height', window.getSize().y - 58 + 'px'); } + }); MediaFolderView.BgSelectors = new Class({ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 15:05:59
|
Revision: 3032 http://openutils.svn.sourceforge.net/openutils/?rev=3032&view=rev Author: diego_schivo Date: 2010-09-10 15:05:52 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-177 don't propagate page Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:59:47 UTC (rev 3031) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:05:52 UTC (rev 3032) @@ -868,7 +868,7 @@ s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s; int p1; while ((p1 = StringUtils.indexOfAny(s, new String[]{ - "&type=", "&command=" + "&type=", "&command=", "&page=" })) != -1) { int p2 = s.indexOf('&', p1 + 1); Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:59:47 UTC (rev 3031) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 15:05:52 UTC (rev 3032) @@ -31,18 +31,7 @@ if (Browser.Engine.name == 'trident' && Browser.Engine.version == 4) this.fixNavWidthIE6(); else this.fixNavWidth(); new mooSelecta({ - selector: '#sorting'/*, - triggerClass: 'selecta2', - triggerPadding: 24, - triggerBeforeImage: '${this.request.contextPath}/.resources/media/css/images/select-left.png', - triggerBeforeImageWidth: 3, - triggerBeforeImageHeight: 21, - wrapperClass: 'selecta2Wrapper', - wrapperWidthAdjustment: 0, - optionClass: 'selecta2Option', - optionClassSelected: 'selecta2OptionSelected', - optionClassOver: 'selecta2OptionOver' - */ + selector: '#sorting' }); new MediaFolderView.BgSelectors('#navigation a.bg-selector'); new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector', this.options); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2010-09-10 14:59:53
|
Revision: 3031 http://openutils.svn.sourceforge.net/openutils/?rev=3031&view=rev Author: fgiust Date: 2010-09-10 14:59:47 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-167 new paginator (and toolbar) layout Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:55:38 UTC (rev 3030) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:59:47 UTC (rev 3031) @@ -73,37 +73,37 @@ { /** - * + * */ public static final String SORT_BY_NAME = "name"; /** - * + * */ public static final String SORT_BY_CREATIONDATE = "creationdate"; /** - * + * */ public static final String SORT_BY_FILENAME = "filename"; /** - * + * */ public static final String SORT_BY_MODIFICATIONDATE = "modificationdate"; /** - * + * */ public static final String SORT_BY_SCORE = "score"; /** - * + * */ public static final String SORT_BY_TITLE = "title"; /** - * + * */ public static final String SORT_BY_USAGE = "usage"; @@ -282,7 +282,7 @@ // casts Iterator<AdvancedResultItem> to Iterator<Content> Iterator<Content> contentIterator = Iterators.filter(searchResult.getItems(), Content.class); medias = Iterators.transform(contentIterator, new MediaBeanBuilder(mtc)); - pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 5, "page"); + pages = MgnlPagingElFunctions.pageList(searchResult.getNumberOfPages(), 10, "page"); } if (medias == null) { Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 14:55:38 UTC (rev 3030) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 14:59:47 UTC (rev 3031) @@ -14,9 +14,21 @@ width: 100%; float: left; line-height: 30px; - background: #E4F5C9 url(images/toolbar-background.png) repeat-x bottom left; + min-height: 56px; + background: #E4F5C9 url(images/toolbar-background-light.png) repeat-x top left; } +.tabsrow1 { + height: 28px; + background: #E4F5C9 url(images/toolbar-background.png) repeat-x top left; +} + +.tabsrow2 { + display: block; + clear: both; + height: 30px; +} + .separator { color: #fff; font-size: 1.3em; @@ -88,6 +100,7 @@ #navigation select#sorting { width: 150px; + visibility: hidden; } .voice a,.voice a:visited,.voice a:hover { @@ -123,15 +136,17 @@ .paging { border-collapse: collapse; - margin: 10px auto 0; + margin: 6px 20px 0 0; } .paging td { padding: 0; - border: 1px solid #999; + border: 2px solid #c9e090; width: 16px; + height: 18px; text-align: center; background-color: #fff; + text-align: center; } .paging td a,.paging td a:visited { @@ -165,10 +180,19 @@ color: #FFFFFF; } -.paging .page-active-false a,.paging .page-active-false a:visited { - color: #CCCCCC; +.paging .page-first,.paging .page-previous,.paging .page-next,.paging .page-last { + background-color: #afcd66; } +.paging .page-first a,.paging .page-previous a,.paging .page-next a,.paging .page-last a { + color: #fff !important; + font-weight: normal; +} + +.pagincontainer { + float: right; +} + .mediaList { list-style: none; margin: 0; @@ -343,7 +367,7 @@ .mediaStatus0,.mediaStatus1 { opacity: 0.75; - filter: alpha(opacity = 75); + filter: alpha(opacity = 75); } div.sexy-tooltip { @@ -366,7 +390,7 @@ background-color: #ffffff; border: 1px solid #cfcfcf; opacity: 0.90; - filter: alpha(opacity = 90); + filter: alpha(opacity = 90); -moz-box-shadow: 3px 3px 3px #666; -webkit-box-shadow: 3px 3px 3px #666; box-shadow: 3px 3px 3px #666; @@ -411,4 +435,9 @@ ul.mediamenu li,ul.mediamenu li a { height: 20px; cursor: pointer; +} + +#scrollablecontent { + overflow-y: scroll; + height: 300px; } \ No newline at end of file Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-10 14:55:38 UTC (rev 3030) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-10 14:59:47 UTC (rev 3031) @@ -291,7 +291,7 @@ <iframe id="advancedSearchView" name="advancedSearchView" class="x-panel-body" src="" style="width:100%; height:100%; border:0 none; margin:0; padding:0; overflow:auto;" frameborder="0" scrolling="no"></iframe> <iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src="" - style="width:100%; height:100%; border:0 none; overflow:auto;" frameborder="0" scrolling="auto"></iframe> + style="width:100%; height:100%; border:0 none; overflow:hidden;" frameborder="0" scrolling="no"></iframe> <div id="formDiv" style="display:none"> <form class="formToSubmit" action="" enctype="multipart/form-data" method="post"> <input type="hidden" name="command" value="saveZip" /> Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:55:38 UTC (rev 3030) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:59:47 UTC (rev 3031) @@ -350,6 +350,31 @@ </form> <div id="navigation"> + + + + + <div class="tabsrow1"> + [#list this.types as type] + [#if type.name == this.type] + [#assign actual = "actual"] + [#else] + [#assign actual = ""] + [/#if] + <div class="voice mediatab ${actual}"> + <a href="${this.mediatabLink(type)}"> + <img src="${this.request.contextPath}${type.menuIcon}" alt="${this.msgs.get('media.types.' + type.name)}" /> + ${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if] + </a> + </div> + [/#list] + </div> + + + <div class="tabsrow2"> + + + <div id="bgselectorblock"> <div class="voice right"> <a name="bg-black" href="#" class="bg-selector black [#if this.bgSelector == 'black']black-active[/#if]" title="${this.msgs.get('media.bgselector.black')}"><!-- --></a> @@ -380,35 +405,32 @@ </select> </div> </div> - [#list this.types as type] - [#if type.name == this.type] - [#assign actual = "actual"] - [#else] - [#assign actual = ""] + + + [#if this.pages?has_content && this.pages?size > 5] + <div class="pagincontainer"> + <table class="paging"> + <tr> + [#list this.pages as page] + <td class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}"> + <a href="${page.url}">${page.label}</a> + </td> + [/#list] + </tr> + </table> + </div> [/#if] - <div class="voice mediatab ${actual}"> - <a href="${this.mediatabLink(type)}"> - <img src="${this.request.contextPath}${type.menuIcon}" alt="${this.msgs.get('media.types.' + type.name)}" /> - ${this.msgs.get('media.types.' + type.name)} [#if this.numberOfMedia?exists](${this.numberOfMedia[type.name]!'0'})[/#if] - </a> + + + </div> - [/#list] + + </div> - [#if this.pages?has_content && this.pages?size > 5] - <div style="clear: left;"> - <table class="paging"> - <tr> - [#list this.pages as page] - <td class="page-current-${page.current?string} page-active-${page.active?string} ${page.cssclass}"> - <a href="${page.url}">${page.label}</a> - </td> - [/#list] - </tr> - </table> - </div> - [/#if] + <div style="clear:both; height: 1px"><!-- --></div> + <div id="scrollablecontent"> <ul class="mediaList"> [#assign index = 0] [#list this.medias as media] @@ -588,5 +610,7 @@ </li> [/#list] </ul> + </div> + </body> </html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 14:55:44
|
Revision: 3030 http://openutils.svn.sourceforge.net/openutils/?rev=3030&view=rev Author: diego_schivo Date: 2010-09-10 14:55:38 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-177 fix Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:46:23 UTC (rev 3029) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:55:38 UTC (rev 3030) @@ -259,7 +259,7 @@ { itemsPerPage = module.getFolderViewItemsPerPage(); } - return module.getSearch().search(request, type, path, false, sorting, module.getFolderViewItemsPerPage(), page); + return module.getSearch().search(request, type, path, false, sorting, itemsPerPage, page); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 14:46:29
|
Revision: 3029 http://openutils.svn.sourceforge.net/openutils/?rev=3029&view=rev Author: diego_schivo Date: 2010-09-10 14:46:23 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-177 config Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-09-10 14:35:10 UTC (rev 3028) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-09-10 14:46:23 UTC (rev 3029) @@ -23,7 +23,9 @@ import info.magnolia.module.ModuleLifecycleContext; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration; import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager; @@ -65,6 +67,8 @@ private int folderViewItemsPerPage; + private Map<String, Integer> folderViewPageSizes = new HashMap<String, Integer>(); + private ZipImporter zipimporter; private List playlistTrackExtensionContributors = new ArrayList(); @@ -190,6 +194,24 @@ } /** + * Returns the folderViewPageSizes. + * @return the folderViewPageSizes + */ + public Map<String, Integer> getFolderViewPageSizes() + { + return folderViewPageSizes; + } + + /** + * @param sizeKey + * @param value + */ + public void addFolderViewPageSizes(String sizeKey, Long value) + { + folderViewPageSizes.put(sizeKey, value.intValue()); + } + + /** * Returns the zipimporter. * @return the zipimporter */ Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:35:10 UTC (rev 3028) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:46:23 UTC (rev 3029) @@ -253,14 +253,13 @@ } writable = folder.isGranted(Permission.WRITE); canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber(); - return MediaEl.module().getSearch().search( - request, - type, - path, - false, - sorting, - MediaEl.module().getFolderViewItemsPerPage(), - page); + MediaModule module = MediaEl.module(); + Integer itemsPerPage = module.getFolderViewPageSizes().get(pagesizeSelector); + if (itemsPerPage == null) + { + itemsPerPage = module.getFolderViewItemsPerPage(); + } + return module.getSearch().search(request, type, path, false, sorting, module.getFolderViewItemsPerPage(), page); } /** Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml (rev 0) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml 2010-09-10 14:46:23 UTC (rev 3029) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="folderViewPageSizes" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>7a61d6f0-b42c-48bf-8772-9e217656e55e</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="size1" sv:type="Long"> + <sv:value>10</sv:value> + </sv:property> + <sv:property sv:name="size2" sv:type="Long"> + <sv:value>25</sv:value> + </sv:property> + <sv:property sv:name="size3" sv:type="Long"> + <sv:value>50</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-09-10T16:39:29.243+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-09-10T16:44:23.579+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 14:35:16
|
Revision: 3028 http://openutils.svn.sourceforge.net/openutils/?rev=3028&view=rev Author: diego_schivo Date: 2010-09-10 14:35:10 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-177 pagesize selection Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:20:15 UTC (rev 3027) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:35:10 UTC (rev 3028) @@ -206,7 +206,7 @@ } } bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white"); - pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "1"); + pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1"); sorting = StringUtils.defaultIfEmpty(sorting, getDefaultSorting()); // for activation status handling Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 14:20:15 UTC (rev 3027) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 14:35:10 UTC (rev 3028) @@ -63,25 +63,25 @@ background-image: url(images/pagesize-selectors.png); } -#navigation .right a.white-active,#navigation .right a.pagesize1-active { +#navigation .right a.white-active,#navigation .right a.size1-active { font-weight: bold; background-position: 0 -16px; } -#navigation .right a.transparent,#navigation .right a.pagesize2 { +#navigation .right a.transparent,#navigation .right a.size2 { background-position: 0 -32px; } -#navigation .right a.transparent-active,#navigation .right a.pagesize2-active { +#navigation .right a.transparent-active,#navigation .right a.size2-active { font-weight: bold; background-position: 0 -48px; } -#navigation .right a.black,#navigation .right a.pagesize3 { +#navigation .right a.black,#navigation .right a.size3 { background-position: 0 -64px; } -#navigation .right a.black-active,#navigation .right a.pagesize3-active { +#navigation .right a.black-active,#navigation .right a.size3-active { font-weight: bold; background-position: 0 -80px; } Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:20:15 UTC (rev 3027) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:35:10 UTC (rev 3028) @@ -45,7 +45,7 @@ */ }); new MediaFolderView.BgSelectors('#navigation a.bg-selector'); - new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector'); + new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector', this.options); new MediaFolderView.Sorting('sorting', this.options); new MediaFolderView.EditMenus('li.media .menuitem'); new MediaFolderView.InfoTooltips('li.media .image'); @@ -101,24 +101,19 @@ MediaFolderView.PagesizeSelectors = new Class({ - initialize: function(selectors){ + Implements: Options, + + initialize: function(selectors, options){ this.selectors = $$(selectors).addEvent('click', this.handleClick.bindWithEvent(this)); - this.previousValue = document.body.className.match(/pagesize-(\w+)/)[1]; + this.setOptions(options); }, handleClick: function(e){ e.stop(); var selector = $(e.target); var value = selector.className.match(/pagesize-selector\s+(\w+)(-active)?/)[1]; - if (value == this.previousValue) return; - if (this.previousValue) $(document.body).removeClass('pagesize' + this.previousValue); - $(document.body).addClass('pagesize' + value); Cookie.write('pagesizeselector', value, {duration: 30}); - this.selectors.each(function(item){ - if (item == selector) item.addClass(value + '-active'); - else if (this.previousValue) item.removeClass(this.previousValue + '-active'); - }, this); - this.previousValue = value; + location.href = '?' + [this.options.queryString, 'type=${this.type}'].join('&'); } }); @@ -129,7 +124,7 @@ initialize: function(select, options){ this.select = $(select); - this.setOptions(options) + this.setOptions(options); this.select.addEvent('change', this.handleSelectChange.bind(this)); }, @@ -336,7 +331,7 @@ }); </script> </head> - <body id="mediafolderview" class="bg-${this.bgSelector} pagesize-${this.pagesizeSelector}"> + <body id="mediafolderview" class="bg-${this.bgSelector}"> <form action="" style="display:none" id="actionForm" method="post"> <input type="hidden" id="actionCmd" name="command" value="delete" /> <input type="hidden" id="actionPath" name="path" value="${this.path!""}" /> @@ -366,13 +361,13 @@ <a name="bg-white" href="#" class="bg-selector white [#if this.bgSelector == 'white']white-active[/#if]" title="${this.msgs.get('media.bgselector.white')}"><!-- --></a> </div> <div class="voice right" style="margin-right: 10px;"> - <a name="pagesize3" href="#" class="pagesize-selector pagesize3"><!-- --></a> + <a name="pagesize3" href="#" class="pagesize-selector size3 [#if this.pagesizeSelector == 'size3']size3-active[/#if]"><!-- --></a> </div> <div class="voice right"> - <a name="pagesize2" href="#" class="pagesize-selector pagesize2"><!-- --></a> + <a name="pagesize2" href="#" class="pagesize-selector size2 [#if this.pagesizeSelector == 'size2']size2-active[/#if]"><!-- --></a> </div> <div class="voice right"> - <a name="pagesize1" href="#" class="pagesize-selector pagesize1"><!-- --></a> + <a name="pagesize1" href="#" class="pagesize-selector size1 [#if this.pagesizeSelector == 'size1']size1-active[/#if]"><!-- --></a> </div> <div class="voice right" style="margin-right: 10px; padding-top: 3px;"> <select id="sorting" name="sorting"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 14:20:21
|
Revision: 3027 http://openutils.svn.sourceforge.net/openutils/?rev=3027&view=rev Author: diego_schivo Date: 2010-09-10 14:20:15 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-177 pagesize selection Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 13:55:50 UTC (rev 3026) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:20:15 UTC (rev 3027) @@ -117,6 +117,8 @@ protected String bgSelector; + protected String pagesizeSelector; + protected String sorting; protected boolean selectMedia; @@ -186,6 +188,7 @@ // right side of navigation bar: sorting and background selectors bgSelector = null; + pagesizeSelector = null; sorting = null; for (Cookie cookie : request.getCookies()) { @@ -193,12 +196,17 @@ { bgSelector = cookie.getValue(); } + else if ("pagesizeselector".equals(cookie.getName())) + { + pagesizeSelector = cookie.getValue(); + } else if ("sorting".equals(cookie.getName())) { sorting = cookie.getValue(); } } bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white"); + pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "1"); sorting = StringUtils.defaultIfEmpty(sorting, getDefaultSorting()); // for activation status handling @@ -217,10 +225,14 @@ return 0; } // sorting must be specified for total-size to work (-1 otherwise) - AdvancedResult typeResult = MediaEl - .module() - .getSearch() - .search(request, type.getName(), path, false, getDefaultSorting(), 0, 1); + AdvancedResult typeResult = MediaEl.module().getSearch().search( + request, + type.getName(), + path, + false, + getDefaultSorting(), + 0, + 1); return typeResult.getTotalSize(); } @@ -241,10 +253,14 @@ } writable = folder.isGranted(Permission.WRITE); canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber(); - return MediaEl - .module() - .getSearch() - .search(request, type, path, false, sorting, MediaEl.module().getFolderViewItemsPerPage(), page); + return MediaEl.module().getSearch().search( + request, + type, + path, + false, + sorting, + MediaEl.module().getFolderViewItemsPerPage(), + page); } /** @@ -597,6 +613,15 @@ } /** + * Returns the pagesizeSelector. + * @return the pagesizeSelector + */ + public String getPagesizeSelector() + { + return pagesizeSelector; + } + + /** * Returns the sorting. * @return the sorting */ @@ -828,7 +853,9 @@ public String getMessage(String key, String param) { - return getMsgs().get(key, new String[]{param }); + return getMsgs().get(key, new String[]{ + param + }); } /** @@ -841,7 +868,9 @@ String s = request.getQueryString(); s = StringUtils.isEmpty(s) ? StringUtils.EMPTY : "&" + s; int p1; - while ((p1 = StringUtils.indexOfAny(s, new String[]{"&type=", "&command=" })) != -1) + while ((p1 = StringUtils.indexOfAny(s, new String[]{ + "&type=", "&command=" + })) != -1) { int p2 = s.indexOf('&', p1 + 1); s = s.substring(0, p1) + (p2 != -1 ? s.substring(p2) : StringUtils.EMPTY); Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 13:55:50 UTC (rev 3026) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 14:20:15 UTC (rev 3027) @@ -45,6 +45,7 @@ */ }); new MediaFolderView.BgSelectors('#navigation a.bg-selector'); + new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector'); new MediaFolderView.Sorting('sorting', this.options); new MediaFolderView.EditMenus('li.media .menuitem'); new MediaFolderView.InfoTooltips('li.media .image'); @@ -98,6 +99,30 @@ }); +MediaFolderView.PagesizeSelectors = new Class({ + + initialize: function(selectors){ + this.selectors = $$(selectors).addEvent('click', this.handleClick.bindWithEvent(this)); + this.previousValue = document.body.className.match(/pagesize-(\w+)/)[1]; + }, + + handleClick: function(e){ + e.stop(); + var selector = $(e.target); + var value = selector.className.match(/pagesize-selector\s+(\w+)(-active)?/)[1]; + if (value == this.previousValue) return; + if (this.previousValue) $(document.body).removeClass('pagesize' + this.previousValue); + $(document.body).addClass('pagesize' + value); + Cookie.write('pagesizeselector', value, {duration: 30}); + this.selectors.each(function(item){ + if (item == selector) item.addClass(value + '-active'); + else if (this.previousValue) item.removeClass(this.previousValue + '-active'); + }, this); + this.previousValue = value; + } + +}); + MediaFolderView.Sorting = new Class({ Implements: Options, @@ -311,7 +336,7 @@ }); </script> </head> - <body id="mediafolderview" class="bg-${this.bgSelector}"> + <body id="mediafolderview" class="bg-${this.bgSelector} pagesize-${this.pagesizeSelector}"> <form action="" style="display:none" id="actionForm" method="post"> <input type="hidden" id="actionCmd" name="command" value="delete" /> <input type="hidden" id="actionPath" name="path" value="${this.path!""}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2010-09-10 13:55:56
|
Revision: 3026 http://openutils.svn.sourceforge.net/openutils/?rev=3026&view=rev Author: fgiust Date: 2010-09-10 13:55:50 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-167 remove title bar from the folder view to gain more space for pagination Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-10 13:50:29 UTC (rev 3025) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-10 13:55:50 UTC (rev 3026) @@ -80,7 +80,6 @@ { region:'center', id:'center-center-panel', - title:'Media', contentEl:'mediaFolderView' }, { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2010-09-10 13:50:36
|
Revision: 3025 http://openutils.svn.sourceforge.net/openutils/?rev=3025&view=rev Author: fgiust Date: 2010-09-10 13:50:29 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-167 pagination styling (wip) Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background.png Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 13:24:47 UTC (rev 3024) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 13:50:29 UTC (rev 3025) @@ -127,25 +127,38 @@ } .paging td { - padding: 0 2px; + padding: 0; + border: 1px solid #999; + width: 16px; + text-align: center; + background-color: #fff; } -.paging td a { - float: left; - line-height: 24px; +.paging td a,.paging td a:visited { + line-height: 14px; text-decoration: none; - width: 24px; + color: #000; + text-align: center; } +.paging .page-current-true { + background-color: #8eb631; +} + .paging .page-current-true a { - background-color: #006699; font-weight: bold; } +.paging td .page-active-false { + background-color: #F8F8F8; +} + .paging td a,.paging .page-active-false a { - background-color: #F8F8F8; font-weight: normal; text-align: center; + font-size: 10px; + width: 16px; + display: block; } .paging .page-current-true a,.paging .page-current-true a:visited { @@ -278,8 +291,7 @@ display: none; } -h4 { - /* ie6 doesn't handle .image h4 */ +h4 { /* ie6 doesn't handle .image h4 */ font-size: 12px; } @@ -331,14 +343,14 @@ .mediaStatus0,.mediaStatus1 { opacity: 0.75; - filter: alpha(opacity = 75); + filter: alpha(opacity = 75); } div.sexy-tooltip { font-size: 0.8em !important; } -div.sexy-tooltip h4{ +div.sexy-tooltip h4 { margin: 0 0 3px 0; padding: 0; } @@ -354,7 +366,7 @@ background-color: #ffffff; border: 1px solid #cfcfcf; opacity: 0.90; - filter: alpha(opacity = 90); + filter: alpha(opacity = 90); -moz-box-shadow: 3px 3px 3px #666; -webkit-box-shadow: 3px 3px 3px #666; box-shadow: 3px 3px 3px #666; @@ -396,7 +408,7 @@ height: 16px; } -ul.mediamenu li, ul.mediamenu li a { +ul.mediamenu li,ul.mediamenu li a { height: 20px; cursor: pointer; } \ No newline at end of file Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hu...@op...> - 2010-09-10 13:32:49
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/290/changes> |
From: <hu...@op...> - 2010-09-10 13:32:45
|
See <https://hudson.openmindonline.it/job/openutils-mgnlmedia/net.sourceforge.openutils$openutils-mgnlmedia/290/changes> |
From: <die...@us...> - 2010-09-10 13:24:54
|
Revision: 3024 http://openutils.svn.sourceforge.net/openutils/?rev=3024&view=rev Author: diego_schivo Date: 2010-09-10 13:24:47 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-177 pagesize buttons Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 13:16:07 UTC (rev 3023) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-09-10 13:24:47 UTC (rev 3024) @@ -44,36 +44,44 @@ margin-right: 10px; } -#navigation .right a.bg-selector { +#navigation .right a.bg-selector,#navigation .right a.pagesize-selector { padding-left: 16px; height: 16px; line-height: 10px; - background: transparent url(images/bg-selectors.png) no-repeat scroll left top; + background: transparent none no-repeat scroll left top; text-indent: -10000px; overflow: hidden; display: block; float: left; } -#navigation .right a.white-active { +#navigation .right a.bg-selector { + background-image: url(images/bg-selectors.png); +} + +#navigation .right a.pagesize-selector { + background-image: url(images/pagesize-selectors.png); +} + +#navigation .right a.white-active,#navigation .right a.pagesize1-active { font-weight: bold; background-position: 0 -16px; } -#navigation .right a.transparent { +#navigation .right a.transparent,#navigation .right a.pagesize2 { background-position: 0 -32px; } -#navigation .right a.transparent-active { +#navigation .right a.transparent-active,#navigation .right a.pagesize2-active { font-weight: bold; background-position: 0 -48px; } -#navigation .right a.black { +#navigation .right a.black,#navigation .right a.pagesize3 { background-position: 0 -64px; } -#navigation .right a.black-active { +#navigation .right a.black-active,#navigation .right a.pagesize3-active { font-weight: bold; background-position: 0 -80px; } Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 13:16:07 UTC (rev 3023) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-10 13:24:47 UTC (rev 3024) @@ -340,6 +340,15 @@ <div class="voice right"> <a name="bg-white" href="#" class="bg-selector white [#if this.bgSelector == 'white']white-active[/#if]" title="${this.msgs.get('media.bgselector.white')}"><!-- --></a> </div> + <div class="voice right" style="margin-right: 10px;"> + <a name="pagesize3" href="#" class="pagesize-selector pagesize3"><!-- --></a> + </div> + <div class="voice right"> + <a name="pagesize2" href="#" class="pagesize-selector pagesize2"><!-- --></a> + </div> + <div class="voice right"> + <a name="pagesize1" href="#" class="pagesize-selector pagesize1"><!-- --></a> + </div> <div class="voice right" style="margin-right: 10px; padding-top: 3px;"> <select id="sorting" name="sorting"> [#if this.request.requestURI?ends_with('/media-advsearch.html')] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2010-09-10 13:16:13
|
Revision: 3023 http://openutils.svn.sourceforge.net/openutils/?rev=3023&view=rev Author: diego_schivo Date: 2010-09-10 13:16:07 +0000 (Fri, 10 Sep 2010) Log Message: ----------- MEDIA-177 pagesize-selectors.png Added Paths: ----------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/pagesize-selectors.png Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/pagesize-selectors.png =================================================================== (Binary files differ) Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/pagesize-selectors.png ___________________________________________________________________ Added: svn:mime-type + image/png This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |