aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-01-17 19:38:38 +0100
committerGeorg Ehrke <dev@georgswebsite.de>2012-01-17 19:48:29 +0100
commit69ca0ae177ad20b45e630838343527558573064d (patch)
treee550b21f94480b4229007f226f46c0151de5e83b
parent1f952318019baca4a8c628b2baeb23b82cc85c99 (diff)
downloadnextcloud-server-69ca0ae177ad20b45e630838343527558573064d.tar.gz
nextcloud-server-69ca0ae177ad20b45e630838343527558573064d.zip
move loading icon to the top bar
-rw-r--r--apps/calendar/css/style.css2
-rwxr-xr-xapps/calendar/templates/calendar.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 6555c25a767..108bc647a7f 100644
--- a/apps/calendar/css/style.css
+++ b/apps/calendar/css/style.css
@@ -17,7 +17,7 @@
#editentry_dialog {display: none;}
#parsingfail_dialog{display: none;}
-#loading { display: none; left: 40%; position: fixed; top: 4.4em; z-index: 100; }
+#loading { display: none;margin: 0;padding:0;margin-top:5px;}
#calendar_holder {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
.fc-content{padding:2px 4px;}
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index feafd17635b..929f5b72f96 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -45,14 +45,14 @@
?>
});
</script>
- <div id="loading"><img src="<?php echo OC_Helper::imagePath('core', 'loading.gif'); ?>" /></div>
<div id="controls">
<div>
<form>
<div id="view">
<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
<input type="button" value="<?php echo $l->t('Month');?>" id="onemonthview_radio"/>
- <input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>
+ <input type="button" value="<?php echo $l->t('List');?>" id="listview_radio"/>&nbsp;&nbsp;
+ <img id="loading" src="<?php echo OC_Helper::imagePath('core', 'loading.gif'); ?>" />
</div>
</form>
<form>