|
From: <die...@us...> - 2009-12-23 15:21:13
|
Revision: 1522
http://openutils.svn.sourceforge.net/openutils/?rev=1522&view=rev
Author: diego_schivo
Date: 2009-12-23 15:21:04 +0000 (Wed, 23 Dec 2009)
Log Message:
-----------
MEDIA-40 link on logo
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 2009-12-23 15:12:10 UTC (rev 1521)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-12-23 15:21:04 UTC (rev 1522)
@@ -120,7 +120,7 @@
},
{
region:'south',
- html:'<div class="mediaBranding" style=""><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" />${this.msgs.get('media.footer.text')}</div>',
+ html:'<div class="mediaBranding"><a href="http://www.openmindonline.it"><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" /></a>${this.msgs.get('media.footer.text')}</div>',
height: 24
}
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-12-31 09:35:59
|
Revision: 1573
http://openutils.svn.sourceforge.net/openutils/?rev=1573&view=rev
Author: fgiust
Date: 2009-12-31 09:35:50 +0000 (Thu, 31 Dec 2009)
Log Message:
-----------
added tracking script
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 2009-12-31 09:35:11 UTC (rev 1572)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2009-12-31 09:35:50 UTC (rev 1573)
@@ -289,5 +289,22 @@
<input type="file" name="zipFile" />
</form>
</div>
+
+ <script type="text/javascript">
+ // <![CDATA[[
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+// ]]>
+</script>
+
+ <script type="text/javascript">
+ // <![CDATA[[
+try {
+var pageTracker = _gat._getTracker("UA-10294410-2");
+pageTracker._trackPageview('/products/media');
+} catch(err) {}
+// ]]>
+</script>
+
</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-01-08 12:25:59
|
Revision: 1603
http://openutils.svn.sourceforge.net/openutils/?rev=1603&view=rev
Author: diego_schivo
Date: 2010-01-08 12:25:53 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
MEDIA-48 Show branding in media navigation page only
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-01-08 12:03:50 UTC (rev 1602)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-01-08 12:25:53 UTC (rev 1603)
@@ -67,7 +67,8 @@
function searchForMedia(textToSearch){
- viewport.getComponent('center-panel').getComponent('center-center-panel').setTitle("Search results for : "+ textToSearch);
+ var centerPanel = viewport.getComponent('center-panel');
+ (selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Search results for : "+ textToSearch);
var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?search="+ textToSearch + "&mgnlCK=" + (new Date()).getTime();
if (selectMedia)
@@ -84,6 +85,38 @@
Ext.onReady(function(){
Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
+ var centerItem;
+ if (selectMedia)
+ {
+ centerItem = {
+ region:'center',
+ id:'center-panel',
+ title:'Media',
+ contentEl:'mediaFolderView'
+ };
+ }
+ else
+ {
+ centerItem = {
+ region:'center',
+ id:'center-panel',
+ layout:'border',
+ border:false,
+ items:[
+ {
+ region:'center',
+ id:'center-center-panel',
+ title:'Media',
+ contentEl:'mediaFolderView'
+ },
+ {
+ region:'south',
+ html:'<div class="mediaBranding"><a href="http://www.openmindonline.it" target="_blank"><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" alt="openmind" /></a>${this.getMessage('media.footer.text', this.moduleVersion)}</div>',
+ height: 24
+ }
+ ]
+ };
+ }
viewport = new Ext.Viewport({
layout:'border',
items:[
@@ -105,25 +138,7 @@
animFloat: false,
stateful: true
},
- {
- region:'center',
- id:'center-panel',
- layout:'border',
- border:false,
- items:[
- {
- region:'center',
- id:'center-center-panel',
- title:'Media',
- contentEl:'mediaFolderView'
- },
- {
- region:'south',
- html:'<div class="mediaBranding"><a href="http://www.openmindonline.it" target="_blank"><img src="${this.request.contextPath}/.resources/media/assets/branding/openmind-logo.png" class="logo" alt="openmind" /></a>${this.getMessage('media.footer.text', this.moduleVersion)}</div>',
- height: 24
- }
- ]
- }
+ centerItem
]
});
@@ -214,7 +229,8 @@
// reload folder content
function reloadFolder(path, type)
{
- viewport.getComponent('center-panel').getComponent('center-center-panel').setTitle("Media - "+ path);
+ var centerPanel = viewport.getComponent('center-panel');
+ (selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?path="+ path + "&mgnlCK=" + (new Date()).getTime();
if (selectMedia)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-01 17:44:47
|
Revision: 1750
http://openutils.svn.sourceforge.net/openutils/?rev=1750&view=rev
Author: diego_schivo
Date: 2010-02-01 17:44:41 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
MEDIA-61 delayed frame address setting
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-02-01 16:54:03 UTC (rev 1749)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-02-01 17:44:41 UTC (rev 1750)
@@ -116,7 +116,8 @@
]
});
- frames['mediaTreeView'].location.href = getTreeUrl();
+ // FF 3.6 patch
+ setTimeout(function() { frames['mediaTreeView'].location.href = getTreeUrl(); }, 100);
if (openPath != null && openPath != "null" && openPath.length > 0)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-02-15 08:49:18
|
Revision: 1939
http://openutils.svn.sourceforge.net/openutils/?rev=1939&view=rev
Author: fgiust
Date: 2010-02-15 08:49:08 +0000 (Mon, 15 Feb 2010)
Log Message:
-----------
MEDIA-81 scrolling="no" should fix scrollbars in IE6
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-02-15 08:34:59 UTC (rev 1938)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-02-15 08:49:08 UTC (rev 1939)
@@ -275,9 +275,9 @@
</head>
<body>
<iframe id="mediaTreeView" name="mediaTreeView" class="x-panel-body" src=""
- style="width:100%;height:100%;border: none;margin:0;padding:0px;" frameborder="0"></iframe>
+ style="width:100%;height:100%;border: none;margin:0;padding:0px;" frameborder="0" scrolling="no"></iframe>
<iframe id="mediaFolderView" name="mediaFolderView" class="x-panel-body" src=""
- style="width:100%;height:100%;border:none; overflow:auto" frameborder="0"></iframe>
+ style="width:100%;height:100%;border:none; overflow:auto" frameborder="0" scrolling="auto"></iframe>
<div id="formDiv" style="display:none">
<form class="formToSubmit" action="" enctype="multipart/form-data" method="post">
<input type="hidden" name="command" value="saveZip" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-03-05 18:58:25
|
Revision: 2099
http://openutils.svn.sourceforge.net/openutils/?rev=2099&view=rev
Author: diego_schivo
Date: 2010-03-05 18:58:18 +0000 (Fri, 05 Mar 2010)
Log Message:
-----------
MEDIA-118 auto center on resize
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-03-05 18:12:50 UTC (rev 2098)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-03-05 18:58:18 UTC (rev 2099)
@@ -195,6 +195,7 @@
{
ulDialog.setWidth(w);
ulDialog.setHeight(h);
+ ulDialog.center();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-09-07 17:15:53
|
Revision: 2999
http://openutils.svn.sourceforge.net/openutils/?rev=2999&view=rev
Author: diego_schivo
Date: 2010-09-07 17:15:47 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
MEDIA-161 expand tree on load
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-03 16:40:59 UTC (rev 2998)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-07 17:15:47 UTC (rev 2999)
@@ -130,6 +130,7 @@
// FF 3.6 patch
setTimeout(function() {
+ setTreeCollapsed(false);
frames['mediaTreeView'].location.href = getTreeUrl();
frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia;
if (openPath != null && openPath != "null" && openPath.length > 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 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-12 08:05:04
|
Revision: 3072
http://openutils.svn.sourceforge.net/openutils/?rev=3072&view=rev
Author: fgiust
Date: 2010-09-12 08:04:57 +0000 (Sun, 12 Sep 2010)
Log Message:
-----------
MEDIA-176 search results are kept after editing a media now
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-12 07:32:58 UTC (rev 3071)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-12 08:04:57 UTC (rev 3072)
@@ -231,28 +231,32 @@
var centerPanel = viewport.getComponent('center-panel');
(selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
- var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?path="+ path + "&mgnlCK=" + (new Date()).getTime();
+ var url = frames['mediaFolderView'].location.pathname;
+
+ var querystring = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+
+ if (url == "") {
+ url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html";
+ }
+
+ querystring['path'] = path;
+ querystring['mgnlCK'] = (new Date()).getTime();
+
if (selectMedia)
{
- url += "&selectMedia=true&actMediaHandle="+ actMediaHandle;
+ querystring['selectMedia'] = true;
+ querystring['actMediaHandle'] = actMediaHandle;
}
if (type != null && type != 'null')
{
- url += "&type=" + type;
+ querystring['type'] = type;
}
if (mediaType != null && mediaType != 'null')
{
- url += "&mediaType=" + mediaType;
+ querystring['mediaType'] = mediaType;
}
-
- var olduri = frames['mediaFolderView'].location.href.parseQueryString();
- if (olduri['page'] != undefined)
- {
- url += "&page=" + olduri['page'];
- }
-
- frames['mediaFolderView'].location.href = url;
+ frames['mediaFolderView'].location.href = url + "?" + new Hash(querystring).toQueryString();
}
function setNewMedia(uuid, thumb, file)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2011-01-04 11:26:56
|
Revision: 3212
http://openutils.svn.sourceforge.net/openutils/?rev=3212&view=rev
Author: molaschi
Date: 2011-01-04 11:26:50 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
MEDIA-197
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 2011-01-04 11:25:56 UTC (rev 3211)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-01-04 11:26:50 UTC (rev 3212)
@@ -244,6 +244,8 @@
querystring['mgnlCK'] = (new Date()).getTime();
+ querystring['command'] = '';
+
if (selectMedia)
{
querystring['selectMedia'] = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2011-01-04 15:45:29
|
Revision: 3213
http://openutils.svn.sourceforge.net/openutils/?rev=3213&view=rev
Author: molaschi
Date: 2011-01-04 15:45:22 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
MEDIA-197
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 2011-01-04 11:26:50 UTC (rev 3212)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-01-04 15:45:22 UTC (rev 3213)
@@ -244,7 +244,8 @@
querystring['mgnlCK'] = (new Date()).getTime();
- querystring['command'] = '';
+ // reset command
+ if (querystring['command']) delete querystring.command;
if (selectMedia)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-01-23 20:20:02
|
Revision: 3277
http://openutils.svn.sourceforge.net/openutils/?rev=3277&view=rev
Author: fgiust
Date: 2011-01-23 20:19:56 +0000 (Sun, 23 Jan 2011)
Log Message:
-----------
MEDIA-193 update to GA async APIs, should improve performances when the script is not available
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 2011-01-23 19:59:23 UTC (rev 3276)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-01-23 20:19:56 UTC (rev 3277)
@@ -307,6 +307,23 @@
}
//]]>
</script>
+
+<script type="text/javascript">
+ // <![CDATA[[
+if (!(document.location.host.indexOf('localhost') > -1) && !(document.location.host.indexOf('127.0.0.1') > -1) ) {
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-10294410-8']);
+ _gaq.push(['_setReferrerOverride', document.location]);
+ _gaq.push(['_trackPageview', '/products/media/' + document.location.host]);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+}
+// ]]>
+</script>
</head>
<body>
<iframe id="mediaTreeView" name="mediaTreeView" class="x-panel-body" src=""
@@ -330,17 +347,6 @@
// ]]>
</script>
- <script type="text/javascript">
- // <![CDATA[[
-try {
-if (!(document.location.host.indexOf('localhost') > -1) && !(document.location.host.indexOf('127.0.0.1') > -1) ) {
-var pageTracker = _gat._getTracker("UA-10294410-2");
-pageTracker._setReferrerOverride(document.location);
-pageTracker._trackPageview('/products/media');
-}
-} catch(err) {}
-// ]]>
-</script>
</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...> - 2011-04-13 09:10:31
|
Revision: 3425
http://openutils.svn.sourceforge.net/openutils/?rev=3425&view=rev
Author: diego_schivo
Date: 2011-04-13 09:10:20 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
MEDIA-224 fix 404 on Chromium
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 2011-04-10 08:27:01 UTC (rev 3424)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-04-13 09:10:20 UTC (rev 3425)
@@ -233,6 +233,8 @@
(selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
var url = frames['mediaFolderView'].location.pathname;
+ // fix 404 on Chromium
+ if (url == 'blank') url = '';
var querystringoriginal = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-07-11 14:38:10
|
Revision: 3579
http://openutils.svn.sourceforge.net/openutils/?rev=3579&view=rev
Author: diego_schivo
Date: 2011-07-11 14:38:04 +0000 (Mon, 11 Jul 2011)
Log Message:
-----------
MEDIA-246 encodeURIComponent
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 2011-07-11 14:30:18 UTC (rev 3578)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-07-11 14:38:04 UTC (rev 3579)
@@ -28,11 +28,12 @@
{
url += "&selectMedia=true";
}
- url += "&pathOpen="+ openPath +"&pathCurrent=" + openPath +"&pathSelected=" + openPath;
+ url += "&pathOpen="+ encodeURIComponent(openPath) +"&pathCurrent=" + encodeURIComponent(openPath) +"&pathSelected=" + encodeURIComponent(openPath);
if (mediaType != null && mediaType != 'null')
{
- url += "&mediaType=" + mediaType;
+ url += "&mediaType=" + encodeURIComponent(mediaType);
}
+ alert(url);
return url;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-07-11 15:03:23
|
Revision: 3580
http://openutils.svn.sourceforge.net/openutils/?rev=3580&view=rev
Author: diego_schivo
Date: 2011-07-11 15:03:12 +0000 (Mon, 11 Jul 2011)
Log Message:
-----------
MEDIA-246 /blank
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 2011-07-11 14:38:04 UTC (rev 3579)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-07-11 15:03:12 UTC (rev 3580)
@@ -33,7 +33,6 @@
{
url += "&mediaType=" + encodeURIComponent(mediaType);
}
- alert(url);
return url;
}
@@ -50,14 +49,14 @@
var centerPanel = viewport.getComponent('center-panel');
(selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Search results for : "+ textToSearch);
- var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?search="+ textToSearch + "&mgnlCK=" + (new Date()).getTime();
+ var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?search=" + encodeURIComponent(textToSearch) + "&mgnlCK=" + (new Date()).getTime();
if (selectMedia)
{
- url += "&selectMedia=true&actMediaHandle="+ actMediaHandle;
+ url += "&selectMedia=true&actMediaHandle=" + encodeURIComponent(actMediaHandle);
}
if (mediaType != null && mediaType != 'null')
{
- url += "&mediaType=" + mediaType;
+ url += "&mediaType=" + encodeURIComponent(mediaType);
}
frames['mediaFolderView'].location.href = url;
}
@@ -138,7 +137,7 @@
setTimeout(function() {
setTreeCollapsed(false);
frames['mediaTreeView'].location.href = getTreeUrl();
- frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistHandle=${this.playlistHandle!''}&${this.playlistSearch!''}";
+ frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+encodeURIComponent(selectMedia)+"&playlistHandle=${this.playlistHandle!''}&${this.playlistSearch!''}";
if (openPath != null && openPath != "null" && openPath.length > 0)
{
reloadFolder(openPath);
@@ -234,8 +233,8 @@
(selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
var url = frames['mediaFolderView'].location.pathname;
- // fix 404 on Chromium
- if (url == 'blank') url = '';
+ // fix 404 on Chromium and IE8
+ if (url == 'blank' || url == '/blank') url = '';
var querystringoriginal = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-08-20 15:47:59
|
Revision: 3619
http://openutils.svn.sourceforge.net/openutils/?rev=3619&view=rev
Author: fgiust
Date: 2011-08-20 15:47:51 +0000 (Sat, 20 Aug 2011)
Log Message:
-----------
MEDIA-241 Analytics imported multiple times
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 2011-08-12 09:27:20 UTC (rev 3618)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-08-20 15:47:51 UTC (rev 3619)
@@ -354,14 +354,5 @@
<input type="file" name="zipFile" />
</form>
</div>
-
- <script type="text/javascript">
- // <![CDATA[[
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-// ]]>
-</script>
-
-
</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: <fg...@us...> - 2011-11-19 21:03:05
|
Revision: 3697
http://openutils.svn.sourceforge.net/openutils/?rev=3697&view=rev
Author: fgiust
Date: 2011-11-19 21:02:59 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
MEDIA-270 Invalid chunk in the browse page url.
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 2011-11-19 21:00:10 UTC (rev 3696)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-11-19 21:02:59 UTC (rev 3697)
@@ -15,6 +15,18 @@
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/miframe.js"></script>
<script type="text/javascript">
// <![CDATA[
+ if ((typeof Range !== "undefined") && !Range.prototype.createContextualFragment)
+{
+ Range.prototype.createContextualFragment = function(html)
+ {
+ var frag = document.createDocumentFragment(),
+ div = document.createElement("div");
+ frag.appendChild(div);
+ div.outerHTML = html;
+ return frag;
+ };
+}
+
var viewport;
var nodeid = "${this.nodeid!''}";
var selectMedia = ${this.selectMedia?string("true", "false")};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|