move loading icon to the top bar

diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
index 6555c25a76797912ac0dbcca83df5ac0b76d61f4..108bc647a7f3c04dd1330ba64f117b216c036220 100644 (file)
--- 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 feafd17635bb443e09bec305cde13eeca00f06f1..929f5b72f9668c2394e5c572633e89072023ad28 100755 (executable)
--- 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>