Changeset 358

Timestamp:

12/18/06 18:03:16 (2 years ago)

Author:

jarmo

Message:

• Merged changes from cmms_js.patch
  

Files:

• trunk/app/views/layouts/mainlevel.rhtml (modified) (1 diff)
• trunk/app/views/user/login.rhtml (modified) (1 diff)

trunk/app/views/layouts/mainlevel.rhtml

@@ -45 +45 @@
-    <% end -%>
-
+    <script type="text/javascript">
+    //<![CDATA[
+
+    // If the page is loaded in an IFrame, redirect its parent to this page.
+    // This is used by the Windows version's loader page.
+    if (window.parent.location != window.location)
+        window.parent.location.replace(window.location);
+
+    //]]>
+    </script>
+
-    <!-- Style for asset type links -->
-    <% types = AssetType.find(:all, :readonly => true, :select => 'id, asset_type_icon_id') -%>

trunk/app/views/user/login.rhtml

@@ -5 +5 @@
-    <title>Welcome to NorfelloCMMS</title>
-    <%= stylesheet_link_tag 'login' %>
+    <script type="text/javascript">
+    //<![CDATA[
+
+    // If the page is loaded in an IFrame, redirect its parent to this page.
+    // This is used by the Windows version's loader page.
+    if (window.parent.location != window.location)
+        window.parent.location.replace(window.location);
+
+    //]]>
+    </script>
-  </head>
-