Aleksander Machniak
2012-06-24 a008a3f0e30bcddf6d9ce4a0015495bf8978c8c2
Fix form buttons (#1488548)

Conflicts:

skins/default/settings.css
4 files modified
16 ■■■■■ changed files
skins/default/settings.css 4 ●●●● patch | view | raw | blame | history
skins/default/templates/folderedit.html 6 ●●●●● patch | view | raw | blame | history
skins/default/templates/identityedit.html 3 ●●●●● patch | view | raw | blame | history
skins/default/templates/settingsedit.html 3 ●●●● patch | view | raw | blame | history
skins/default/settings.css
@@ -134,14 +134,14 @@
#formfooter .footerleft
{
  padding-left: 15px;
  padding: 0 2px 10px;
  white-space: nowrap;
  float: left;
}
#formfooter .footerright
{
  padding-right: 15px;
  padding: 0 2px 10px;
  white-space: nowrap;
  text-align: right;
  float: right;
skins/default/templates/folderedit.html
@@ -11,12 +11,14 @@
<div id="folder-details" class="boxcontent">
  <roundcube:object name="folderdetails" />
  <p>
  <div id="formfooter">
    <div class="footerleft">
    <roundcube:if condition="!strlen(request:_mbox)" />
    <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
    <roundcube:endif />
    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
  </p>
    </div>
  </div>
</div>
<script type="text/javascript">rcube_init_tabs('folder-details > form')</script>
skins/default/templates/identityedit.html
@@ -19,12 +19,15 @@
<div id="identity-details" class="boxcontent">
<roundcube:object name="identityform" id="identity-form" size="40" textareacols="70" textarearows="6" />
<script type="text/javascript">rcube_init_tabs('identity-form')</script>
<div id="formfooter">
    <div class="footerleft">
  <roundcube:button command="save" type="input" class="button mainaction" label="save" />
</div>
</div>
</div>
</body>
</html>
skins/default/templates/settingsedit.html
@@ -11,13 +11,12 @@
<div id="prefs-details" class="boxcontent">
<roundcube:object name="userprefs" form="form" />
</div>
<div id="formfooter">
<div class="footerleft">
<roundcube:button command="save" type="input" class="button mainaction" label="save" />
</div>
</div>
</div>
</body>
</html>