wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into calendar_sharing

Browse source
This commit is contained in:
Georg Ehrke 2012-03-17 13:59:00 +01:00
commit eaa1074ccb
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/calendar/templates/settings.php
View file

@ -31,7 +31,7 @@
</select><input type="checkbox" name="timezonedetection" id="timezonedetection"><label for="timezonedetection"><?php echo $l->t('Check always for changes of the timezone'); ?></label></td></tr>
<tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
<select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
<select style="display: none; width: 60px;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
<option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
<option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
</select>

1
apps/gallery/lib/scanner.php
View file

@ -131,4 +131,3 @@ class OC_Gallery_Scanner {
}
}
?>

2
apps/gallery/templates/index.php
View file

@ -18,7 +18,7 @@ $l = new OC_L10N('gallery');
<input type="button" id="g-settings-button" value="<?php echo $l->t('Settings');?>" onclick="javascript:settings();"/>
</div>
<div id="g-album-navigation">
<div class="crumb last" style="background-image:url('/owncloud/core/img/breadcrumb.png')">
<div class="crumb last" style="background-image:url('<?php echo OC::$WEBROOT;?>/core/img/breadcrumb.png')">
<a href="javascript:returnToElement(0);">main</a>
</div>
</div>

1
settings/css/settings.css
View file

@ -5,6 +5,7 @@ input#openid, input#webdav { width:20em; }
#passworderror { display:none; }
#passwordchanged { display:none; }
input#identity { width:20em; }
#email { width: 17em; }
.msg.success{ color:#fff; background-color:#0f0; padding:3px; text-shadow:1px 1px #000; }
.msg.error{ color:#fff; background-color:#f00; padding:3px; text-shadow:1px 1px #000; }