Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'multicals'

  • Loading branch information...
commit 19943a288251889c2e1632f0777a143687d147cc 2 parents f894812 + 6fedab8
@bobo bobo authored
Showing with 45 additions and 9 deletions.
  1. +12 −8 _layouts/default.html
  2. +7 −1 index.html
  3. +4 −0 main.css
  4. +22 −0 scripts.js
View
20 _layouts/default.html
@@ -42,6 +42,8 @@
<a href='/add.html'>add event</a>
<a href='/crew.html'>crew</a>
<a href='/usergroups.html'>usergroups</a>
+ <input id="free" type="checkbox" checked>Free</input>
+ <input id="payed" type="checkbox" >Payed</input>
</span>
</div>
</nav>
@@ -55,15 +57,17 @@
<footer>
Design &copy; 2011 <a href="http://ecomba.org" target="_new">Enrique Comba Riepenhausen</a> used with permission. Remix and images <a href="http://peter.lind.be" target="_new">Peter Lind</a> </footer>
</div>
+
+<script type="text/javascript" src="scripts.js"></scripts>
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-23319845-1']);
- _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+// var _gaq = _gaq || [];
+// _gaq.push(['_setAccount', 'UA-23319845-1']);
+// _gaq.push(['_trackPageview']);
+// (function() {
+ // var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ // ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ // var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ // })();
</script>
</body>
</html>
View
8 index.html
@@ -2,4 +2,10 @@
layout: default
---
- <iframe src="https://www.google.com/calendar/embed?showTitle=0&amp;showPrint=0&amp;showCalendars=0&amp;showTz=0&amp;height=600&amp;wkst=2&amp;bgcolor=%23ffffff&amp;src=oarn29ir2vm2kjfaa5vof7qicg%40group.calendar.google.com&amp;color=%23691426&amp;ctz=Europe%2FParis" style=" border-width:0 " width="100%" height="600" frameborder="0" scrolling="no"></iframe>
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.min.js"></script>
+<div id="calendar">
+
+</div>
+
+
+
View
4 main.css
@@ -120,3 +120,7 @@ font-size:.9em;
color:#fff;
text-decoration:none;
}
+
+.right {
+ float:right;
+}
View
22 scripts.js
@@ -30,3 +30,25 @@ function showTwitter() {
}
}).render().setList('xlson', 'stodev').start();
}
+var allEvents='<iframe src="https://www.google.com/calendar/embed?height=600&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=7rvvlpilutdt53vm9lbc2o2d20%40group.calendar.google.com&amp;color=%23125A12&amp;src=ifskb2drnv82aq36mjt0ho2cp0%40group.calendar.google.com&amp;color=%23856508&amp;src=oarn29ir2vm2kjfaa5vof7qicg%40group.calendar.google.com&amp;color=%23182C57&amp;ctz=Europe%2FStockholm" style=" border-width:0 " width="100%" height="600" frameborder="0" scrolling="no"></iframe>';
+
+var payedEvents='<iframe src="https://www.google.com/calendar/embed?src=ifskb2drnv82aq36mjt0ho2cp0%40group.calendar.google.com&ctz=Europe/Stockholm" style="border: 0" width="100%" height="600" frameborder="0" scrolling="no"></iframe>';
+
+var freeEvents='<iframe id="calendar" src="https://www.google.com/calendar/embed?showTitle=0&amp;showPrint=0&amp;showCalendars=0&amp;showTz=0&amp;height=600&amp;wkst=2&amp;bgcolor=%23ffffff&amp;src=oarn29ir2vm2kjfaa5vof7qicg%40group.calendar.google.com&amp;color=%23691426&amp;ctz=Europe%2FParis" style=" border-width:0 " width="100%" height="600" frameborder="0" scrolling="no"></iframe>'
+$(document).ready(function() {
+ $("input").click(function() {
+ var checkedCount = $("input:checked").length;
+ console.log(checkedCount);
+ if(checkedCount==2) {
+ console.log("all")
+ $("#calendar").html(allEvents);
+ } else if($("input[id=free]:checked").length==1) {
+ console.log("free")
+ $("#calendar").html(freeEvents);
+ } else if($("input[id=payed]:checked").length==1) {
+ console.log("payed")
+ $("#calendar").html(payedEvents);
+ }
+ });
+ $("#calendar").html(freeEvents);
+});
Please sign in to comment.
Something went wrong with that request. Please try again.