diff options
| author | Antoine Huvelle <ahu@openerp.com> | 2011-12-26 17:37:35 +0100 |
|---|---|---|
| committer | Antoine Huvelle <ahu@openerp.com> | 2011-12-26 17:37:35 +0100 |
| commit | 12df615818cefc532acfec0590cac2b2226328cc (patch) | |
| tree | da60c702195bf71b5ad18edafaa8c09256770972 /addons/web_dashboard/static/src | |
| parent | 8c60adf5a9d55d8b40b037b4bfac7d490662ef3d (diff) | |
[imp] before merge
bzr revid: ahu@openerp.com-20111226163735-o53sk7407fuh3w67
Diffstat (limited to 'addons/web_dashboard/static/src')
| -rw-r--r-- | addons/web_dashboard/static/src/css/dashboard.css | 8 | ||||
| -rw-r--r-- | addons/web_dashboard/static/src/xml/web_dashboard.xml | 20 |
2 files changed, 17 insertions, 11 deletions
diff --git a/addons/web_dashboard/static/src/css/dashboard.css b/addons/web_dashboard/static/src/css/dashboard.css index 8e403776b59..db37c970a7e 100644 --- a/addons/web_dashboard/static/src/css/dashboard.css +++ b/addons/web_dashboard/static/src/css/dashboard.css @@ -369,10 +369,10 @@ box-shadow: 0 1px 2px #bbb; } -.openerp .welcome_message { +.openerp .oe_welcome_message { display:none; } -.openerp .initial_welcome_message { +.openerp .oe_initial_welcome_message { width:30%; text-align:center; margin:10px 35% 0 35%; @@ -392,7 +392,7 @@ text-shadow: #fff 0 1px 0; } -.openerp .initial_welcome_message ul{ +.openerp .oe_initial_welcome_message ul{ padding:10px 0 0 0; margin:0; list-style-type: none; @@ -401,7 +401,7 @@ background-repeat: no-repeat; cursor: pointer; } -.openerp .initial_welcome_message ul a, .openerp .initial_welcome_message ul a:hover, .openerp .initial_welcome_message ul a:active, .openerp .initial_welcome_message ul a:focus { +.openerp .oe_initial_welcome_message ul a, .openerp .initial_welcome_message ul a:hover, .openerp .initial_welcome_message ul a:active, .openerp .initial_welcome_message ul a:focus { color:#222; text-decoration:none; } diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index c623c94f9ee..84b14f91604 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -106,22 +106,28 @@ <t t-name="web_dashboard.ApplicationTiles"> <div> - <h1 class="welcome_message">Welcome to OpenERP</h1> <div class="oe_applications_tiles"> - <h1>Welcome to OpenERP</h1> + <h1 class="oe_welcome_message">Welcome to OpenERP</h1> </div> </div> </t> <div t-name="web_dashboard.ApplicationInstaller"> - <div class="initial_welcome_message"> + <div class="oe_initial_welcome_message"> <ul> - <li>Remember to bookmark <a href="javascript:if(document.all) window.external.AddFavorite(location.href,document.title); else if(window.sidebar) window.sidebar.addPanel (document.title,location.href,'');">this page.</a></li> - <li>Remember your login: <t t-esc="widget.session.username"/></li> + <li>Remember to bookmark + <a class="oe_welcome_url" href="#"> + This url + </a> + </li> + <li>Your login: <t t-esc="widget.session.username"/></li> </ul> - <h3>Please choose the first application to install.</h3> </div> <div class="oe_installer" /> </div> - +<t t-extend="web_dashboard.ApplicationInstaller"> + <t t-jquery=".oe_welcome_url"> + this.attr('href', window.location.host); + </t> +</t> </template> |