Merge branch 'master' into enrolWhilePropose

Conflicts: collections/courses.js
Openki · Nov 11, 2015 · a82a390 · a82a390
2 parents 6a28c4d + 884d3e9
commit a82a390
Show file tree

Hide file tree

Showing 52 changed files with 10,874 additions and 9,521 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ dump/
 
 settings.json
 server/extracts.msgfmt
+version.js
diff --git a/.meteor/packages b/.meteor/packages
@@ -37,7 +37,6 @@ accounts-google
 standard-minifiers
 rzymek:moment-locale-da
 rzymek:moment-locale-ja
-ecmascript
 es5-shim
 okgrow:router-autoscroll
 meteorhacks:subs-manager
diff --git a/.meteor/versions b/.meteor/versions
@@ -89,9 +89,10 @@ mongo-id@1.0.1
 mongo-livedata@1.0.9
 msgfmt:core@2.0.0-preview.13
 msgfmt:extract@2.0.0-preview.9
-msgfmt:ui@2.0.0-preview.3
+msgfmt:ui@2.0.0-preview.5
 nemo64:bootstrap@3.3.5_2
 nemo64:bootstrap-data@3.3.5
+nicolaslopezj:router-layer@0.0.11
 npm-bcrypt@0.7.8_2
 npm-mongo@1.4.39_1
 oauth@1.1.6

diff --git a/bin/install-hooks b/bin/install-hooks
@@ -0,0 +1,3 @@
+#!/bin/sh
+ln -s ../../bin/update-version .git/hooks/post-checkout
+ln -s ../../bin/update-version .git/hooks/post-commit
diff --git a/bin/update-version b/bin/update-version
@@ -0,0 +1,16 @@
+#!/bin/sh
+ver=$(git describe --abbrev=0)
+complete=$(git describe)
+branch=$(git rev-parse --abbrev-ref HEAD)
+commit=$(git rev-parse HEAD)
+timestamp=$(git log -1 --date=short --pretty=format:%cd)
+cat > version.js << EOF
+VERSION = {
+    "basic": "$ver",
+    "complete": "$complete",
+    "branch": "$branch",
+    "commit": "$commit",
+    "timestamp": "$timestamp"
+};
+EOF
+
diff --git a/client/styles/custom/custom.mixins.import.less b/client/styles/custom/custom.mixins.import.less
@@ -32,6 +32,8 @@
     transform: rotate(@degrees) scale(@x-axis, @y-axis);
 }
 
+// CUSTOM BUTTON MIXINS
+
 .btn-thin {
 	.btn;
 	padding: 3px 12px;
@@ -74,3 +76,40 @@
 		border-top: 3px solid @body-bg;
 	}
 }
+
+// CUSTOM GRID MIXINS
+// One-line statements using bootstrap grid mixins
+// Value 0 is used to inherit the previous value
+
+.grid(@xs) {
+	.make-xs-column(@xs);
+}
+
+.grid(@xs, @sm) {
+	.make-xs-column(@xs);
+	.make-sm-column(@sm);
+}
+
+.grid(@xs, @sm, @md) {
+	.make-xs-column(@xs);
+
+	& when not (@sm = 0) {
+		.make-sm-column(@sm);
+	}
+
+	.make-md-column(@md);
+}
+
+.grid(@xs, @sm, @md, @lg) {
+	.make-xs-column(@xs);
+
+	& when not (@sm = 0) {
+		.make-sm-column(@sm);
+	}
+
+	& when not (@md = 0) {
+		.make-md-column(@md);
+	}
+
+	.make-lg-column(@lg);
+}
diff --git a/client/styles/custom/custom.variables.import.less b/client/styles/custom/custom.variables.import.less
@@ -4,8 +4,14 @@
 @light-blue:           #D8EBF4; //Used mainly for backgrounds
 @ownrole:              #bcb6ff;
 @ownrole-color:        #4E4E1C;
+@orange:               #f98f39;
+@yellow:               #f3f981;
 
 @mobile:               ~"screen and (max-width: @{screen-xs})";
 @tablet:               ~"screen and (min-width: @{screen-xs}) and (max-width: @{screen-sm})";
 @desktop:              ~"screen and (min-width: @{screen-md}) and (max-width: @{screen-md})";
 @large-desktop:        ~"screen and (min-width: @{screen-lg}) and (max-width: @{screen-lg})";
+
+//set custom grid breakpoints
+@screen-xxs:  550px;
+@screen-xxxs: 380px;
diff --git a/client/styles/main.less b/client/styles/main.less
@@ -9,6 +9,10 @@
 @import "custom/custom.variables.import.less";
 @import "custom/custom.classes.import.less";
 
+// Load Modules
+@import "modules/calendar_event/calendar.event.grid.import.less";
+@import "modules/calendar_event/calendar.event.import.less";
+
 // Load Template Stylesheets
 @import "views/messages/messages.import.less";
 @import "views/main.import.less";
@@ -28,12 +32,16 @@
 
 @import "views/find/find.import.less";
 
+@import "views/frames/calendar.grid.import.less";
+@import "views/frames/calendar.import.less";
+
 @import "views/groups/groups.import.less";
 
 @import "views/categories/categories.import.less";
 
 @import "views/login/login.import.less";
 
+@import "views/misc/kiosk/kiosk.grid.import.less";
 @import "views/misc/kiosk/kiosk.import.less";
 
 @import "views/navigation/navigation.footer.import.less";

diff --git a/client/styles/modules/calendar_event/calendar.event.grid.import.less b/client/styles/modules/calendar_event/calendar.event.grid.import.less
@@ -0,0 +1,40 @@
+.frame_calendar_event_container {
+  .grid(4, 3, 0, 2);
+  height: 200px;
+  padding: 0 3px 10px;
+
+  @media screen and (max-width: @screen-xxs) {
+    .grid(6);
+    padding: 0 3px 10px;
+  }
+
+  @media screen and (max-width: @screen-xxxs) {
+    .grid(12);
+    padding: 0 3px 10px;
+  }
+
+  .frame_calendar_event {
+    .grid(12);
+    .no-padding;
+    height: 100%;
+
+    .-eventLocationTime {
+      .grid(12);
+      height: 50px;
+      padding: 5px;
+    }
+
+    .-eventTitle {
+      .grid(12);
+      max-height: 56px;
+      padding: 5px;
+    }
+
+    .-eventDescription {
+      .grid(12);
+      height: 85px;
+      margin-top: -3px;
+      padding: 0 5px 5px;
+    }
+  }
+}
diff --git a/client/styles/modules/calendar_event/calendar.event.import.less b/client/styles/modules/calendar_event/calendar.event.import.less
@@ -0,0 +1,32 @@
+.frame_calendar_event_container {
+  .frame_calendar_event {
+    .transition(0.5s);
+    background: @light-blue;
+
+    &:hover {
+      .box-shadow;
+    }
+
+    .-eventLocationTime,
+    .-eventTitle,
+    .-eventDescription {
+      overflow: hidden;
+      word-wrap: break-word;
+    }
+
+    .-eventLocationTime {
+      background: @brand-success;
+      border-bottom: 1px solid #fff;
+      color: #333;
+    }
+
+    .-eventTitle {
+      color: #333;
+      font-size: medium;
+    }
+
+    .-eventDescription {
+      color: @brand-primary;
+    }
+  }
+}
diff --git a/client/styles/views/calendar/calendar.import.less b/client/styles/views/calendar/calendar.import.less
@@ -4,6 +4,35 @@
 	}
 }
 
+.switchDate {
+	.make-xs-column(12);
+	background-color: @brand-primary;
+	font-size: 32px;
+	color: white;
+	text-align:center;
+	margin: -15px 0 1em !important;
+
+	button{
+		.btn;
+		.btn-primary;
+		float: left;
+		margin: 3px;
+		margin-top: 6px;
+
+		&:first-child {
+			margin-left: 0;
+		}
+
+		&:last-child {
+			margin-right: 0;
+		}
+	}
+
+	&>.right{
+		float: right;
+	}
+}
+
 .calendar_eventlist {
 	margin-left: -20px;
 }

diff --git a/client/styles/views/courses/details/course.discussion.import.less b/client/styles/views/courses/details/course.discussion.import.less
@@ -10,6 +10,7 @@
 	button {
 		.btn;
 		.btn-primary;
+		float: right;
 
 		&.cancel,
 		&.cancelEdit {
@@ -46,6 +47,19 @@
 			}
 		}
 	}
+
+	label {
+		padding-top: 8px;
+		font-weight: inherit;
+
+		input.-anon {
+			width: auto;
+			height: auto;
+			display: inline-block;
+			margin: 0;
+			vertical-align: text-top;
+		}
+	}
 }
 
 .discussion-titlebar {
@@ -104,8 +118,8 @@
 		border-top: none;
 		text-align: right;
 
-		button {
-			margin-left: 5px;
+		button.cancel {
+			margin-right: 0;
 		}
 	}
 }

diff --git a/client/styles/views/courses/events/course.events.import.less b/client/styles/views/courses/events/course.events.import.less
@@ -106,11 +106,17 @@ div#edit_event_description {
 	.make-xs-column(12);
 	background: @brand-primary;
 	color: @body-bg;
-	border: 15px solid @brand-primary;
+	border: 5px solid @brand-primary;
 
 	h4 {
 		font-weight: bold;
 	}
+	& > .link{
+		position: absolute;
+		right: 10px;
+		top: -1px;
+		color: black;
+	}
 }
 
 

diff --git a/client/styles/views/frames/calendar.grid.import.less b/client/styles/views/frames/calendar.grid.import.less
@@ -0,0 +1,24 @@
+.frame_calendar_date {
+  .grid(12);
+  padding: 0 0 10px;
+
+  &:first-child {
+    margin-top: -50px;
+  }
+
+  .date {
+    padding: 5px 7px 5px 9px;
+    width: 100px;
+
+    @media screen and (max-width: @screen-xxxs) {
+      .grid(12);
+      padding: 0.5em;
+    }
+  }
+
+  .frame_calendar_events {
+    .grid(12);
+    padding: 10px 7px 0;
+    margin-bottom: -10px;
+  }
+}
diff --git a/client/styles/views/frames/calendar.import.less b/client/styles/views/frames/calendar.import.less
@@ -0,0 +1,13 @@
+.frame_calendar_date {
+  .date {
+    background: lighten(@orange, 25%);
+    border-left: 10px solid @orange;
+    font-size: large;
+    text-align: center;
+
+    @media screen and (max-width: @screen-xxxs) {
+      border-left: none;
+      border-top: 10px solid @orange;
+    }
+  }
+}
diff --git a/client/styles/views/main.import.less b/client/styles/views/main.import.less
@@ -113,3 +113,35 @@ button.report {
 		margin-bottom: 15px;
 	}
 }
+
+.noscript {
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 100%;
+	width: 100%;
+	background: @light-blue;
+
+	.noscript_message_box {
+		margin: auto;
+		width: 300px;
+		height: 100px;
+		position: relative;
+		top: calc(~"50% - 100px");
+		border: 3px solid #fff;
+		background: @brand-primary;
+
+		img {
+			.grid(4);
+			.no-padding;
+			height: 95px;
+		}
+
+		.noscript_message {
+			.grid (8);
+			padding: 15px 15px;
+			color: #fff;
+			height: 100%;
+		}
+	}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ dump/

		settings.json
		server/extracts.msgfmt
		version.js