diff options
author | thomascube <thomas@roundcube.net> | 2011-01-18 18:00:57 +0000 |
---|---|---|
committer | thomascube <thomas@roundcube.net> | 2011-01-18 18:00:57 +0000 |
commit | 0501b637a3177cce441166b5fcfe27c9bd9fbe0f (patch) | |
tree | 5460128ef65d2510a7538c4a0e7336987e090ca1 /skins/default/templates | |
parent | e81a30752b244394b03cbcaa0df254c93b379782 (diff) |
Merge branch devel-addressbook (r4193:4382) back into trunk
Diffstat (limited to 'skins/default/templates')
-rw-r--r-- | skins/default/templates/contact.html | 9 | ||||
-rw-r--r-- | skins/default/templates/contactadd.html | 22 | ||||
-rw-r--r-- | skins/default/templates/contactedit.html | 22 |
3 files changed, 45 insertions, 8 deletions
diff --git a/skins/default/templates/contact.html b/skins/default/templates/contact.html index 06d0fbee5..084664e9d 100644 --- a/skins/default/templates/contact.html +++ b/skins/default/templates/contact.html @@ -9,12 +9,17 @@ <div id="contact-title" class="boxtitle"><roundcube:label name="contactproperties" /></div> <div id="contact-details" class="boxcontent"> - <roundcube:object name="contactdetails" /> + <div id="contactphoto"><roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" /></div> + <roundcube:object name="contacthead" id="contacthead" /> + <div style="clear:both"></div> + <div id="contacttabs"> + <roundcube:object name="contactdetails" /> + </div> <p> <roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" /> </p> </div> -<script type="text/javascript">rcube_init_tabs('contact-details')</script> +<script type="text/javascript">rcube_init_tabs('contacttabs')</script> </body> </html> diff --git a/skins/default/templates/contactadd.html b/skins/default/templates/contactadd.html index 1a10f10ac..b5fd05609 100644 --- a/skins/default/templates/contactadd.html +++ b/skins/default/templates/contactadd.html @@ -5,18 +5,34 @@ <roundcube:include file="/includes/links.html" /> <script type="text/javascript" src="/functions.js"></script> </head> -<body class="iframe"> +<body class="iframe" onload="rcube_init_mail_ui()"> <div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div> <div id="contact-details" class="boxcontent"> - <roundcube:object name="contacteditform" size="40" /> +<form name="editform" method="post" action="./"> + <div id="contactphoto"> + <roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" /> + <div class="formlinks"> + <roundcube:button command="upload-photo" id="uploadformlink" type="link" label="addphoto" class="disabled" classAct="active" onclick="rcmail_ui.show_popup('uploadform', true);return false" condition="env:photocol" /><br/> + <roundcube:button command="delete-photo" type="link" label="delete" class="disabled" classAct="active" condition="env:photocol" /> + </div> + </div> + <roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" /> + <div style="clear:both"></div> + + <div id="contacttabs"> + <roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" /> + </div> <p> <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" /> <roundcube:button command="save" type="input" class="button mainaction" label="save" /> </p> </form> </div> -<script type="text/javascript">rcube_init_tabs('contact-details')</script> + +<roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" /> + +<script type="text/javascript">rcube_init_tabs('contacttabs')</script> </body> </html> diff --git a/skins/default/templates/contactedit.html b/skins/default/templates/contactedit.html index a15aaf22a..681201caa 100644 --- a/skins/default/templates/contactedit.html +++ b/skins/default/templates/contactedit.html @@ -5,18 +5,34 @@ <roundcube:include file="/includes/links.html" /> <script type="text/javascript" src="/functions.js"></script> </head> -<body class="iframe"> +<body class="iframe" onload="rcube_init_mail_ui()"> <div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div> <div id="contact-details" class="boxcontent"> - <roundcube:object name="contacteditform" size="40" /> +<form name="editform" method="post" action="./"> + <div id="contactphoto"> + <roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" /> + <div class="formlinks"> + <roundcube:button command="upload-photo" id="uploadformlink" type="link" label="replacephoto" class="disabled" classAct="active" onclick="rcmail_ui.show_popup('uploadform', true);return false" condition="env:photocol" /><br/> + <roundcube:button command="delete-photo" type="link" label="delete" class="disabled" classAct="active" condition="env:photocol" /> + </div> + </div> + <roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" /> + <div style="clear:both"></div> + + <div id="contacttabs"> + <roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" /> + </div> <p> <roundcube:button command="show" type="input" class="button" label="cancel" /> <roundcube:button command="save" type="input" class="button mainaction" label="save" /> </p> </form> </div> -<script type="text/javascript">rcube_init_tabs('contact-details')</script> + +<roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" /> + +<script type="text/javascript">rcube_init_tabs('contacttabs')</script> </body> </html> |