Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3066] trunk/openutils-mgnlmedia/src/main
|
From: <fg...@us...> - 2010-09-11 17:42:20
|
Revision: 3066
http://openutils.svn.sourceforge.net/openutils/?rev=3066&view=rev
Author: fgiust
Date: 2010-09-11 17:42:14 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
minor changes to look&feel
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/assets/branding/background.png
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.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-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-11 17:42:14 UTC (rev 3066)
@@ -859,4 +859,13 @@
{
return SortMode.FILENAME_ASC;
}
+
+ /**
+ * Returns the installed media module version.
+ * @return version as string.
+ */
+ public String getModuleVersion()
+ {
+ return MediaEl.module().getVersion();
+ }
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/assets/branding/background.png
===================================================================
(Binary files differ)
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2010-09-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/branding.css 2010-09-11 17:42:14 UTC (rev 3066)
@@ -2,12 +2,16 @@
font-family: Verdana, sans-serif;
font-size: 11px;
line-height: 19px;
- background: transparent url(../assets/branding/background.png) repeat-x scroll left top;
+ background: #fff url(../assets/branding/background.png) repeat-x scroll left top;
color: #333;
height: 22px;
text-align: center;
}
+#branding-panel .x-panel-body-noheader {
+ border: none;
+}
+
.mediaBranding img.logo {
display: inline;
margin: 0 8px 0 12px;
@@ -20,4 +24,4 @@
.mgnlListHeaderBackground {
border: 10px solid red;
-}
+}
\ No newline at end of file
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-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/ie-fix.css 2010-09-11 17:42:14 UTC (rev 3066)
@@ -25,3 +25,7 @@
#navigation .sortingcontainer {
padding-top: 8px;
}
+
+.mediaBranding {
+ height: 26px !important;
+}
\ 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-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2010-09-11 17:42:14 UTC (rev 3066)
@@ -4,7 +4,10 @@
<head>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/ext/css/ext-all.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/ext/css/xtheme-gray.css" />
- <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/branding.css" />
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/branding.css?version=${this.moduleVersion}" />
+ <!--[if lte IE 7]>
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
+ <![endif]-->
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-base.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-all.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/miframe.js"></script>
@@ -84,6 +87,7 @@
},
{
region:'south',
+ id:'branding-panel',
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><span class="brandinginfo">${this.getMessage('media.footer.text', this.moduleVersion)}</span></div>',
height: 24
}
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-11 16:33:45 UTC (rev 3065)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-09-11 17:42:14 UTC (rev 3066)
@@ -5,7 +5,7 @@
<title>${this.path!?html!""}</title>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/multibox.css" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/sexy-tooltips/msn.css" />
- <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css" />
+ <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/folderView.css?version=${this.moduleVersion}" />
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/mooSelecta.css" />
<!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
@@ -33,9 +33,9 @@
new mooSelecta({
selector: '#sorting'
});
- new MediaFolderView.BgSelectors('#navigation a.bg-selector');
- new MediaFolderView.PagesizeSelectors('#navigation a.pagesize-selector', this.options);
- new MediaFolderView.Sorting('sorting', this.options);
+ new MediaFolderView.BgSelectors('#navigation a.bg-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');
},
@@ -295,7 +295,7 @@
});
new MediaFolderView({queryString: '${this.currentQueryString()?js_string}'});
-
+
[#if message?exists]
alert("${message?js_string}");
[/#if]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
