diff options
| author | thomascube <thomas@roundcube.net> | 2012-01-02 14:44:28 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2012-01-02 14:44:28 +0000 |
| commit | 7c2a9310c4104f51fcf56379dcc3511fa5bfae2d (patch) | |
| tree | f7ce98283b0c3ce29d0e375e55c8fe7aaee1a677 /skins/larry | |
| parent | c6db4aa46bd285ef7b3d63cba5e957373a116485 (diff) | |
Use iframes for identity management
Diffstat (limited to 'skins/larry')
| -rw-r--r-- | skins/larry/templates/identities.html | 7 | ||||
| -rw-r--r-- | skins/larry/templates/identityedit.html | 36 | ||||
| -rw-r--r-- | skins/larry/ui.js | 2 |
3 files changed, 11 insertions, 34 deletions
diff --git a/skins/larry/templates/identities.html b/skins/larry/templates/identities.html index 905bc100a..a48821871 100644 --- a/skins/larry/templates/identities.html +++ b/skins/larry/templates/identities.html @@ -20,12 +20,13 @@ <roundcube:object name="identitiesList" id="identities-table" class="listing" cellspacing="0" summary="Identities list" noheader="true" editIcon="" /> </div> <div class="boxfooter"> -<roundcube:button command="add" type="link" title="newidentity" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" condition="config:identities_level:0<2" /> +<roundcube:button command="add" type="link" title="newidentity" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" condition="config:identities_level:0<2" /><roundcube:button command="delete" type="link" title="delete" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" content="-" condition="config:identities_level:0<2" /> </div> </div> -<div id="identity-details" class="uibox contentbox watermark"> -<roundcube:object name="message" id="message" class="statusbar" /> +<div id="identity-details" class="uibox contentbox"> + <roundcube:object name="identityframe" id="preferences-frame" style="width:100%; height:96%" src="/watermark.html" /> + <roundcube:object name="message" id="message" class="statusbar" /> </div> </div> diff --git a/skins/larry/templates/identityedit.html b/skins/larry/templates/identityedit.html index d31c4a6e7..2657c2d13 100644 --- a/skins/larry/templates/identityedit.html +++ b/skins/larry/templates/identityedit.html @@ -4,43 +4,19 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body> +<body class="iframe"> -<roundcube:include file="/includes/header.html" /> - -<div id="mainscreen" class="offset"> - -<roundcube:include file="/includes/settingstabs.html" /> - -<div id="settings-right"> - -<div id="identitieslist" class="uibox listbox"> -<h2 class="boxtitle"><roundcube:label name="identities" /></h2> -<div class="scroller withfooter"> -<roundcube:object name="identitiesList" id="identities-table" class="listing" noheader="true" editIcon="" /> -</div> -<div class="boxfooter"> -<roundcube:button command="add" type="link" title="newidentity" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" condition="config:identities_level:0<2" /> -</div> -</div> - -<div id="identity-details" class="uibox contentbox"> <h1 class="boxtitle"><roundcube:object name="steptitle" /></h1> -<div class="boxcontent scroller"> +<div id="preferences-details" class="boxcontent"> <roundcube:object name="identityform" class="propform" size="40" textareacols="40" textarearows="6" /> - -<p class="formbuttons"> - <roundcube:button command="save" type="input" class="button mainaction" label="save" /> - <roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'" /> -</p> -</div> - -<roundcube:object name="message" id="message" class="statusbar" /> </div> +<div id="formfooter"> +<div class="footerleft formbuttons"> + <roundcube:button command="save" type="input" class="button mainaction" label="save" /> + <roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity' && config:identities_level:0<2" /> </div> - </div> <roundcube:include file="/includes/footer.html" /> diff --git a/skins/larry/ui.js b/skins/larry/ui.js index 6729fa63a..c43198aa5 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -120,7 +120,7 @@ function rcube_mail_ui() new rcube_splitter({ id:'folderviewsplitter', p1:'#folderslist', p2:'#folder-details', orientation:'v', relative:true, start:305, min:150, size:12 }).init(); } - else if (rcmail.env.action.indexOf('identit') >= 0) { + else if (rcmail.env.action == 'identities') { new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details', orientation:'v', relative:true, start:305, min:150, size:12 }).init(); } |