3 files changed, 74 insertions, 61 deletions
diff --git a/app/php/controls/CalendarScaffold.tpl b/app/php/controls/CalendarScaffold.tpl
index 9aad9d6..9e94955 100644
--- a/app/php/controls/CalendarScaffold.tpl
+++ b/app/php/controls/CalendarScaffold.tpl
@@ -1,59 +1,61 @@
-<com:TActiveDataGrid ID="Calendars"
-                     CssClass="calendarScaffold"
-                     DataKeyField="UID"
-                     AutoGenerateColumns="false"
-                     OnEditCommand="editRow"
-                     OnCancelCommand="cancelRowEdit"
-                     OnUpdateCommand="saveRow">
-  <com:TActiveBoundColumn ID="Name"
-                          ReadOnly="true"
-                          HeaderText="Calendar"
-                          DataField="Name" />
-  <com:TActiveHyperLinkColumn ID="Website"
-                              HeaderText="WWW"
-                              Text="[www]"
-                              Target="_blank"
-                              DataNavigateUrlField="Website" />
-  <com:TActiveHyperLinkColumn ID="Url"
-                              HeaderText="ICS"
-                              Text="[ics]"
-                              Target="_blank"
-                              DataNavigateUrlField="Url" />
-  <com:TActiveDropDownListColumn ID="Category"
-                                 HeaderText="Category"
-                                 DataTextField="Category.Name"
-                                 DataValueField="CategoryID"
-                                 ListValueField="ID"
-                                 ListTextField="Name" />
-  <com:TActiveCheckBoxColumn ID="Visible"
-                             HeaderText="Default"
-                             DataField="Visible" />
-  <com:TActiveBoundColumn ID="CustomName"
-                          HeaderText="Name"
-                          DataField="CustomName" />
-  <com:TActiveBoundColumn ID="CustomUrl"
-                          HeaderText="URL"
-                          DataField="CustomUrl" />
-  <com:TActiveTemplateColumn ID="CustomImage"
-                             HeaderText="Image">
-    <prop:ItemTemplate>
-      <com:TImage>
-        <prop:ImageUrl><%# $this->Parent->Data->CustomImageUrl %></prop:ImageUrl>
-      </com:TImage>
-    </prop:ItemTemplate>
-    <prop:EditItemTemplate>
-      <com:TActiveTextBox ID="Value">
-        <prop:Text><%# $this->Parent->Data->CustomImage %></prop:Text>
-      </com:TActiveTextBox><br />
-      <com:SafeActiveFileUpload
-          OnFileUpload="SourceTemplateControl.uploadRowFile">
-        <prop:CustomData><%# $this->Parent->Data->UID %></prop:CustomData>
-      </com:SafeActiveFileUpload>
-    </prop:EditItemTemplate>
-  </com:TActiveTemplateColumn>
-  <com:TActiveEditCommandColumn
-      HeaderText=""
-      EditText="Edit"
-      UpdateText="Save"
-      CancelText="Cancel" />
-</com:TActiveDataGrid>
+<com:TPanel
+    CssClass="calendarScaffold">
+  <com:TActiveDataGrid ID="Calendars"
+                       DataKeyField="UID"
+                       AutoGenerateColumns="false"
+                       OnEditCommand="editRow"
+                       OnCancelCommand="cancelRowEdit"
+                       OnUpdateCommand="saveRow">
+    <com:TActiveBoundColumn ID="Name"
+                            ReadOnly="true"
+                            HeaderText="Calendar"
+                            DataField="Name" />
+    <com:TActiveHyperLinkColumn ID="Website"
+                                HeaderText="WWW"
+                                Text="[www]"
+                                Target="_blank"
+                                DataNavigateUrlField="Website" />
+    <com:TActiveHyperLinkColumn ID="Url"
+                                HeaderText="ICS"
+                                Text="[ics]"
+                                Target="_blank"
+                                DataNavigateUrlField="Url" />
+    <com:TActiveDropDownListColumn ID="Category"
+                                   HeaderText="Category"
+                                   DataTextField="Category.Name"
+                                   DataValueField="CategoryID"
+                                   ListValueField="ID"
+                                   ListTextField="Name" />
+    <com:TActiveCheckBoxColumn ID="Visible"
+                               HeaderText="Default"
+                               DataField="Visible" />
+    <com:TActiveBoundColumn ID="CustomName"
+                            HeaderText="Name"
+                            DataField="CustomName" />
+    <com:TActiveBoundColumn ID="CustomUrl"
+                            HeaderText="URL"
+                            DataField="CustomUrl" />
+    <com:TActiveTemplateColumn ID="CustomImage"
+                               HeaderText="Image">
+      <prop:ItemTemplate>
+        <com:TImage>
+          <prop:ImageUrl><%# $this->Parent->Data->CustomImageUrl %></prop:ImageUrl>
+        </com:TImage>
+      </prop:ItemTemplate>
+      <prop:EditItemTemplate>
+        <com:TActiveTextBox ID="Value">
+          <prop:Text><%# $this->Parent->Data->CustomImage %></prop:Text>
+        </com:TActiveTextBox><br />
+        <com:SafeActiveFileUpload
+            OnFileUpload="SourceTemplateControl.uploadRowFile">
+          <prop:CustomData><%# $this->Parent->Data->UID %></prop:CustomData>
+        </com:SafeActiveFileUpload>
+      </prop:EditItemTemplate>
+    </com:TActiveTemplateColumn>
+    <com:TActiveEditCommandColumn
+        HeaderText=""
+        EditText="Edit"
+        UpdateText="Save"
+        CancelText="Cancel" />
+  </com:TActiveDataGrid>
+</com:TPanel>
diff --git a/app/php/controls/scripts/CalendarScaffold.js b/app/php/controls/scripts/CalendarScaffold.js
index 58a7f73..815a3da 100644
--- a/app/php/controls/scripts/CalendarScaffold.js
+++ b/app/php/controls/scripts/CalendarScaffold.js
@@ -1,8 +1,8 @@
 $('body').on(
     'click',
-    'main table.calendarScaffold tbody a[href^="javascript:;//"]',
+    'main .calendarScaffold tbody a[href^="javascript:;//"]',
     function(e) {
         var loader = $('<div>').addClass('calendarScaffoldLoader');
-        $('main div[id$="_Container"]').append(loader);
+        $('main .calendarScaffold div[id$="_Container"]').append(loader);
     }
 );
diff --git a/app/php/controls/styles/CalendarScaffold.css b/app/php/controls/styles/CalendarScaffold.css
new file mode 100644
index 0000000..6e38dbb
--- /dev/null
+++ b/app/php/controls/styles/CalendarScaffold.css
@@ -0,0 +1,11 @@
+.calendarScaffold {
+    position: relative;
+}
+.calendarScaffold .calendarScaffoldLoader {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(255,255,255,0.8);
+}