Removed function __proto__ tweak for HereDocs - IE got confused

geekbrit · geekbrit · commit 2e1aa41e1c33 · 2013-08-20T13:48:57.000-04:00
diff --git a/css/test.css b/css/test.css
@@ -1,5 +1,6 @@
-h1 {
-  margin-left: 180px; }
+.header {
+  margin-left: 180px;
+  width: 640px; }
 
 .rc_bodyweek {
   height: 400px;
@@ -10,16 +11,18 @@ h1 {
   margin-left: 180px; }
 
 .event_palette {
+  border-right: 1px solid #888888;
   position: fixed;
-  top: 50px;
-  left: 10px; }
+  top: 10px;
+  left: 10px;
+  width: 160px; }
 
 .unassigned {
-  top: 300px;
+  top: 330px;
   background: #FFD;
   width: 160px;
   min-height: 180px;
-  border: 1px solid #888800;
+  border-right: 1px solid #888800;
   text-align: center; }
   .unassigned h2 {
     font-size: 18px;
@@ -31,7 +34,9 @@ h1 {
 
 .in_palette {
   -webkit-box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.2);
-  box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.2); }
+  box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.2);
+  margin-left: auto;
+  margin-right: auto; }
 
 .event {
   background: rgba(255, 255, 255, 0.6);
diff --git a/templates/week.template.js b/templates/week.template.js
@@ -1,8 +1,3 @@
-// Multiline Function String - Nate Ferrero - Public Domain
-(function(){}).__proto__.heredoc = function() {
-    return this.toString().replace(/.*\/\*\n([\s\S]*)\n\*\/.*/m, "$1");
-};
-
 
 // [TODO] Add support for per-day opening/closing times 
 
@@ -59,7 +54,7 @@ var render_week = doT.template((function(){/*
     $('.calimg').click(function(){ $(this).datepicker( "dialog", {{= it.baseDate }}, dateSelect ) });
 }}
 
-*/}).heredoc());
+*/}).toString().replace(/.*\/\*\n([\s\S]*)\n\*\/.*/m, "$1"));
 
 
 //
@@ -100,6 +95,8 @@ var render_week_event = doT.template((function(){/*
   <div class="rc_event_body">{{=it.attr.ev_text}}
     {{? it.attr.locked }}<img class='lockedevent' alt='locked' src='img/padlock.png'></img>{{?}}
   </div>
+{{? it.attr.resource != "unassigned_event_resource"}}
   <div class="rc_event_postpad" style="height:{{=it.attr.t_postpad}}px;"></div>
+{{?}}
 </div>
-*/}).heredoc());
+*/}).toString().replace(/.*\/\*\n([\s\S]*)\n\*\/.*/m, "$1"));
diff --git a/test.html b/test.html
@@ -9,8 +9,15 @@
 	<link rel="stylesheet" type="text/css" href="css/test.css">
 </head>
 <body>
-	<h1>Resource Calendar Demo Page</h1>
+	<div class='header'>
+		<h1>Resource Calendar Demo Page</h1>
+		<p>Rendering of calendars and events has been abstracted out to a javascript template file that
+		   uses the "doT.js" templating system [<a href='http://olado.github.io/doT/'>http://olado.github.io/doT/</a>].
+		   This layout is just one possible way to use the Resource Calendar system; it is fully customizable.</p>
+		<p>Source code for the Resource Calendar jquery plugin, and a description of functionality implemented so far, can be found at: <a href="https://github.com/geekbrit/ResCal">https://github.com/geekbrit/ResCal</a></p>
+	</div>
 	<div class='event_palette'>
+	    <p>Drag these to a calendar<br>to create a meeting</p>
 		<div class='ip_spacing'><div class='rc_event client event in_palette' data-evtype='client'   ><p>Client Meeting</p></div></div>
 		<div class='ip_spacing'><div class='rc_event internal event in_palette' data-evtype='internal' ><p>Internal Meeting</p></div></div>
 		<div class='ip_spacing'><div class='rc_event vendor event in_palette' data-evtype='vendor'   ><p>Vendor Meeting</p></div></div>
