Revision: 1958
http://mrbs.svn.sourceforge.net/mrbs/?rev=1958&view=rev
Author: cimorrison
Date: 2011-09-20 14:06:01 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Simplified the way in which JavaScript override styles are applied
Modified Paths:
--------------
mrbs/branches/datatables/web/mrbs-ielte6.css
mrbs/branches/datatables/web/mrbs.css.php
mrbs/branches/datatables/web/style.inc
Removed Paths:
-------------
mrbs/branches/datatables/web/mrbs-js-overrides.css.php
mrbs/branches/datatables/web/mrbs-js-overrides.js
Modified: mrbs/branches/datatables/web/mrbs-ielte6.css
===================================================================
--- mrbs/branches/datatables/web/mrbs-ielte6.css 2011-09-20 12:27:06 UTC
(rev 1957)
+++ mrbs/branches/datatables/web/mrbs-ielte6.css 2011-09-20 14:06:01 UTC
(rev 1958)
@@ -20,8 +20,8 @@
/* We don't want the controls for multiple bookings for IE6, because they rely
on div:hover working */
/* which is not supported by IE6. So reverse the JavaScript overrides and
just treat IE6 as though */
/* JavaScript was disabled.
*/
-div.multiple_control {display: none}
-.multiple_booking .maxi a {padding-left: 2px}
+.js div.multiple_control {display: none}
+.js .multiple_booking .maxi a {padding-left: 2px}
.minimized div.mini {display: none} /* Ignore the minimized class and always
display the maxi table */
.minimized div.maxi {display: block}
Deleted: mrbs/branches/datatables/web/mrbs-js-overrides.css.php
===================================================================
--- mrbs/branches/datatables/web/mrbs-js-overrides.css.php 2011-09-20
12:27:06 UTC (rev 1957)
+++ mrbs/branches/datatables/web/mrbs-js-overrides.css.php 2011-09-20
14:06:01 UTC (rev 1958)
@@ -1,33 +0,0 @@
-<?php
-
-// $Id$
-
-// Only used if JavaScript is enabled
-
-require_once "systemdefaults.inc.php";
-require_once "config.inc.php";
-require_once "functions.inc";
-require_once "theme.inc";
-
-header("Content-type: text/css");
-expires_header(60*30); // 30 minute expiry
-
-?>
-
-<?php
-// Over-rides for multiple bookings. If JavaScript is enabled then we want to
see the JavaScript controls.
-// And we will need to extend the padding so that the controls don't overwrite
the booking text
-?>
-
-div.multiple_control {
- display: block; /* if JavaScript is enabled then we want to see the
JavaScript controls */
- }
-.multiple_booking .maxi a {padding-left: <?php echo $main_cell_height +
$main_table_cell_border_width + 2 ?>px}
-
-<?php
-// Don't display anything with a class of js_none (used for example for hiding
Submit
-// buttons when we're submitting onchange)
-?>
-.js_none {
- display: none;
- }
Deleted: mrbs/branches/datatables/web/mrbs-js-overrides.js
===================================================================
--- mrbs/branches/datatables/web/mrbs-js-overrides.js 2011-09-20 12:27:06 UTC
(rev 1957)
+++ mrbs/branches/datatables/web/mrbs-js-overrides.js 2011-09-20 14:06:01 UTC
(rev 1958)
@@ -1,10 +0,0 @@
-/* $Id$ */
-
-/* Creates a link to a JavaScript over-ride stylesheet */
-
-var cssNode = document.createElement('link');
-cssNode.setAttribute('rel', 'stylesheet');
-cssNode.setAttribute('type', 'text/css');
-cssNode.setAttribute('href', 'mrbs-js-overrides.css.php');
-document.getElementsByTagName('head')[0].appendChild(cssNode);
-
Modified: mrbs/branches/datatables/web/mrbs.css.php
===================================================================
--- mrbs/branches/datatables/web/mrbs.css.php 2011-09-20 12:27:06 UTC (rev
1957)
+++ mrbs/branches/datatables/web/mrbs.css.php 2011-09-20 14:06:01 UTC (rev
1958)
@@ -78,6 +78,12 @@
select.room_area_select {margin-right: 0.5em}
+<?php
+// Don't display anything with a class of js_none (used for example for hiding
Submit
+// buttons when we're submitting onchange). The .js class is added to the
<body> by JavaScript
+?>
+.js .js_none {display: none}
+
/* ------------ ADMIN.PHP ---------------------------*/
<?php
// Adjust the label width to suit the longest label - it will depend on the
translation being used
@@ -323,6 +329,7 @@
.dwm_main#month_main td:hover.valid {background-color: <?php echo
$row_highlight_color ?>}
+
<?php
// (2) JAVASCRIPT HIGHLIGHTING
//
@@ -429,6 +436,17 @@
.minimized div.mini {display: block}
.minimized div.maxi {display: none}
+<?php
+// Over-rides for multiple bookings. If JavaScript is enabled then we want to
see the JavaScript controls.
+// And we will need to extend the padding so that the controls don't overwrite
the booking text
+?>
+
+.js div.multiple_control {
+ display: block; /* if JavaScript is enabled then we want to see the
JavaScript controls */
+ }
+.js .multiple_booking .maxi a {padding-left: <?php echo $main_cell_height +
$main_table_cell_border_width + 2 ?>px}
+
+
/* booking privacy status */
.private {opacity: 0.6; font-style: italic}
Modified: mrbs/branches/datatables/web/style.inc
===================================================================
--- mrbs/branches/datatables/web/style.inc 2011-09-20 12:27:06 UTC (rev
1957)
+++ mrbs/branches/datatables/web/style.inc 2011-09-20 14:06:01 UTC (rev
1958)
@@ -10,11 +10,7 @@
?>
<link rel="stylesheet" href="mrbs.css.php" type="text/css">
<link rel="stylesheet" media="print" href="mrbs-print.css.php"
type="text/css">
- <?php
- // JavaScript overrides first, followed by the IE overrides. This allows
- // the IE overrides to override the JavaScript overrides.
- ?>
- <script src="mrbs-js-overrides.js" type="text/javascript"></script>
+
<!--[if IE]>
<link rel="stylesheet" href="mrbs-ie.css" type="text/css">
<![endif]-->
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
