`, and ``.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@@ -93,11 +88,11 @@
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-@icon-font-path: "../fonts/";
+// '@icon-font-path' automatically set by Bootstrap package.
//** File name for all font files.
-@icon-font-name: "glyphicons-halflings-regular";
+// '@icon-font-name' automatically set by Bootstrap package.
//** Element ID within SVG icon file.
-@icon-font-svg-id: "glyphicons_halflingsregular";
+// '@icon-font-svg-id' automatically set by Bootstrap package.
//== Components
@@ -116,7 +111,7 @@
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
-@line-height-large: 1.33;
+@line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
@line-height-small: 1.5;
@border-radius-base: 4px;
@@ -187,6 +182,11 @@
@btn-link-disabled-color: @gray-light;
+// Allows for customizing button radius independently from global border radius
+@btn-border-radius-base: @border-radius-base;
+@btn-border-radius-large: @border-radius-large;
+@btn-border-radius-small: @border-radius-small;
+
//== Forms
//
@@ -204,6 +204,7 @@
// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
//** Default `.form-control` border radius
+// This has no effect on ``s in some browsers, due to the limited stylability of ``s in CSS.
@input-border-radius: @border-radius-base;
//** Large `.form-control` border radius
@input-border-radius-large: @border-radius-large;
@@ -211,7 +212,7 @@
@input-border-radius-small: @border-radius-small;
//** Border color for inputs on focus
-@input-border-focus: @brand-primary;
+@input-border-focus: #66afe9;
//** Placeholder text color
@input-color-placeholder: #999;
@@ -223,6 +224,9 @@
//** Small `.form-control` height
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+//** `.form-group` margin
+@form-group-margin-bottom: 15px;
+
@legend-color: @gray-dark;
@legend-border-color: #e5e5e5;
@@ -282,7 +286,8 @@
@zindex-popover: 1060;
@zindex-tooltip: 1070;
@zindex-navbar-fixed: 1030;
-@zindex-modal: 1040;
+@zindex-modal-background: 1040;
+@zindex-modal: 1050;
//== Media queries breakpoints
@@ -334,7 +339,7 @@
@grid-gutter-width: 30px;
// Navbar collapse
//** Point at which the navbar becomes uncollapsed.
-@grid-float-breakpoint: @screen-desktop;
+@grid-float-breakpoint: @screen-sm-min;
//** Point at which the navbar begins collapsing.
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
@@ -395,7 +400,7 @@
@navbar-default-toggle-border-color: #ddd;
-// Inverted navbar
+//=== Inverted navbar
// Reset inverted navbar basics
@navbar-inverse-color: lighten(@gray-light, 15%);
@navbar-inverse-bg: #222;
@@ -496,6 +501,7 @@
@jumbotron-bg: @gray-lighter;
@jumbotron-heading-color: inherit;
@jumbotron-font-size: ceil((@font-size-base * 1.5));
+@jumbotron-heading-font-size: ceil((@font-size-base * 4.5));
//== Form states and alerts
@@ -514,9 +520,9 @@
@state-warning-bg: #fcf8e3;
@state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
-@state-danger-text: #444;
-@state-danger-bg: rgba(255,255,255,0.4);
-@state-danger-border: @brand-secondary;
+@state-danger-text: #a94442;
+@state-danger-bg: #f2dede;
+@state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
//== Tooltips
@@ -869,5 +875,7 @@
@page-header-border-color: @gray-lighter;
//** Width of horizontal description list titles
@dl-horizontal-offset: @component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint: @grid-float-breakpoint;
//** Horizontal line color.
@hr-border: @gray-lighter;
diff --git a/client/stylesheets/sites/_style.less b/client/stylesheets/sites/_style.less
old mode 100644
new mode 100755
index c0764fb..fc76511
--- a/client/stylesheets/sites/_style.less
+++ b/client/stylesheets/sites/_style.less
@@ -1,5 +1,4 @@
-@import "../vendor/custom.bootstrap.import.less";
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
body {
background: @main-background;
@@ -36,17 +35,13 @@ input:-webkit-autofill {
-webkit-box-shadow: 0 0 0px 1000px white inset;
}
-.application-content {
- @media (max-width: @screen-sm-min) {
+.application-content {
+ @media (max-width: @screen-sm-min) {
margin: 15px inherit;
}
@media (min-width: @screen-sm-min) {
padding: 30px inherit;
- }
-}
-
-.btn-secondary {
- .button-variant(@btn-primary-color; @brand-secondary; @brand-secondary);
+ }
}
.container-fluid {
@@ -69,6 +64,16 @@ input:not([type="submit"]):focus {
box-shadow: 0 0 0px 1000px white inset;
}
+input.input-clear[type="checkbox"]:focus {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+input[type="checkbox"]:focus {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
.full-width {
width: 100%;
}
@@ -151,3 +156,27 @@ input:not([type="submit"]):focus {
.search-icon {
padding-right: 10px;
}
+
+.tag-box{
+ padding-top: 15px;
+}
+
+.setting-padding{
+ padding:15px;
+}
+
+.btn-margin{
+ margin-bottom: 15px;
+}
+
+.long-string-fix{
+ word-wrap: break-word;
+}
+
+.card-tag{
+ display: inline-block;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ max-width: 100%;
+ white-space: nowrap;
+}
diff --git a/client/stylesheets/sites/_variables.import.less b/client/stylesheets/sites/_variables.import.less
deleted file mode 100644
index 8e874aa..0000000
--- a/client/stylesheets/sites/_variables.import.less
+++ /dev/null
@@ -1 +0,0 @@
-@import "../vendor/custom.bootstrap.import.less";
diff --git a/client/stylesheets/sites/about.less b/client/stylesheets/sites/about.less
index 1708b84..c683894 100644
--- a/client/stylesheets/sites/about.less
+++ b/client/stylesheets/sites/about.less
@@ -1,4 +1,4 @@
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
.row-same-height [class*="col-"] {
@media (min-width: @screen-sm-min) {
diff --git a/client/stylesheets/sites/carousel.less b/client/stylesheets/sites/carousel.less
index 29878af..d6792dd 100644
--- a/client/stylesheets/sites/carousel.less
+++ b/client/stylesheets/sites/carousel.less
@@ -1,25 +1,34 @@
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
.carousel {
+ @media (min-width: @screen-sm-min) { height: 500px; }
+ @media (min-width: @screen-md-min) { height: 550px; }
+ @media (min-width: @screen-lg-min) { height: 600px; }
background-position: center;
background-size: cover;
color: #fff;
- padding: 50px 0;
- @media (min-width: @screen-sm-min) {
- min-height: 500px;
- }
- @media (min-width: @screen-md-min) {
- min-height: 550px;
- }
- @media (min-width: @screen-lg-min) {
- min-height: 600px;
- }
+}
+
+.campus-carousel {
+ background-position: center;
+ background-size: cover;
+ color: #fff;
+ height: 200px;
+}
+
+.v-center {
+ position: relative;
+ top: 50%;
+ -webkit-transform: translateY(-50%);
+ -moz-transform: translateY(-50%);
+ -ms-transform: translateY(-50%);
+ -o-transform: translateY(-50%);
+ transform: translateY(-50%);
}
.carousel-content {
@media (min-width: @screen-sm-min) {
position: absolute;
- top: 25%;
}
}
@@ -31,6 +40,17 @@
overflow: hidden;
margin: 0;
}
+.carousel-title-rounded {
+ font-weight: 900;
+ color: #fff;
+ padding: 15px;
+ line-height: 38px;
+ overflow: hidden;
+ margin: 0;
+ border: 4px solid @brand-primary;
+ background-color: transparent;
+ border-radius: 10px!important;
+}
.carousel-description {
margin: 40px 0;
diff --git a/client/stylesheets/sites/footer.less b/client/stylesheets/sites/footer.less
index 12eb167..abcd484 100644
--- a/client/stylesheets/sites/footer.less
+++ b/client/stylesheets/sites/footer.less
@@ -1,4 +1,4 @@
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
.email-arrow {
background-color: #333333;
@@ -28,10 +28,10 @@
.footer-left, .footer-right {
padding: 30px 0;
- @media (min-width: @screen-sm-min) {
+ @media (min-width: @screen-sm-min) {
height: 320px;
}
- @media (min-width: @screen-md-min) {
+ @media (min-width: @screen-md-min) {
height: 340px;
}
}
diff --git a/client/stylesheets/sites/loading_icon.less b/client/stylesheets/sites/loading_icon.less
index e4ce2d9..62fc6ea 100644
--- a/client/stylesheets/sites/loading_icon.less
+++ b/client/stylesheets/sites/loading_icon.less
@@ -1,4 +1,4 @@
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
.input-symbol {
position: absolute;
diff --git a/client/stylesheets/sites/navbar.less b/client/stylesheets/sites/navbar.less
index 67bf764..9a9a685 100644
--- a/client/stylesheets/sites/navbar.less
+++ b/client/stylesheets/sites/navbar.less
@@ -1,4 +1,4 @@
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
.navbar .navbar-default {
margin-bottom: 0;
@@ -13,7 +13,7 @@
background: white;
border: none;
margin-bottom: 0;
- @media (min-width: @screen-sm-min) {
+ @media (min-width: @screen-sm-min) {
margin: 0;
}
}
diff --git a/client/stylesheets/sites/petition.less b/client/stylesheets/sites/petition.less
old mode 100644
new mode 100755
index d8ee7f7..8184a6d
--- a/client/stylesheets/sites/petition.less
+++ b/client/stylesheets/sites/petition.less
@@ -1,4 +1,19 @@
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
+
+.container h1 {
+ color: @brand-primary;
+}
+
+.filter-checkboxes {
+ text-overflow: ellipsis;
+ overflow:hidden;
+ white-space:nowrap;
+ max-width: 300px;
+ .filter-checkbox {
+ padding:5px 10px;
+
+ }
+}
.author {
font-weight: 300;
@@ -30,7 +45,7 @@
.input-search {
margin: 0 auto;
@media (min-width: @screen-sm-min) {
- max-width: 400px;
+ max-width: 400px;
}
}
@@ -39,9 +54,7 @@
text-align: left;
vertical-align: top;
width: 100%;
- @media (min-width: @screen-sm-min) {
- margin-top: 25px;
- }
+ margin-top: 25px;
}
.module-row {
@@ -59,7 +72,7 @@
.module-white {
background: #ffffff;
- border: 0.25em solid transparent;
+ border: 0.25em solid transparent;
}
.petition-graph {
@@ -72,10 +85,13 @@
.petition-signature-module {
@media (max-width: @screen-xs-max) {
- display: none;
}
}
+.petition-signature-module {
+ margin-bottom: 30px;
+}
+
.petition-initials {
-webkit-column-count: 5;
-moz-column-count: 5;
@@ -101,10 +117,17 @@
.petition-sign-count {
font-size: 18px;
+ display:inline-block;
+}
+
+.signed-badge {
+ padding: 7px 7px 9px 7px;
+ margin-left: 10px;
+ position: relative;
}
.petition-social-wrapper {
- margin-bottom: 50px;
+ margin-bottom: 0px;
}
.petition-subtitle {
@@ -132,7 +155,7 @@
}
}
-.post-title-graph {
+.petition-title-graph {
svg {
@media (max-width: @screen-sm-min) {
left: 90%;
@@ -162,25 +185,9 @@
fill: #fff;
}
-@keyframes popin {
- from { opacity: 0; transform: scale(0.5);}
- to { opacity: 1; transform: scale(1);}
-}
-@-webkit-keyframes popin {
- from { opacity: 0; -webkit-transform: scale(0.5);}
- to { opacity: 1; -webkit-transform: scale(1);}
-}
-@-moz-keyframes popin {
- from { opacity: 0; -moz-transform: scale(0.5);}
- to { opacity: 1; -moz-transform: scale(1);}
-}
-
.square {
padding-bottom: 15px;
padding-top: 15px;
- animation: popin 0.5s;
- -webkit-animation: popin 0.5s;
- -moz-animation: popin 0.5s;
}
.square-content {
@@ -189,13 +196,13 @@
@media (max-width: @screen-sm-min) {
min-height: 100px;
}
- @media (min-width: @screen-sm-min) {
+ @media (min-width: @screen-sm-min) {
height: 275px;
}
- @media (min-width: @screen-md-min) {
+ @media (min-width: @screen-md-min) {
height: 275px;
}
- @media (min-width: @screen-lg-min) {
+ @media (min-width: @screen-lg-min) {
height: 250px;
}
}
@@ -268,5 +275,10 @@
position: absolute;
font-style: italic;
margin-top: 10px;
- bottom: 25px;
+ bottom: 25px;
+}
+
+.petition-align-fix {
+ margin-right: 15px;
+ margin-left: 15px;
}
diff --git a/client/stylesheets/sites/select2.less b/client/stylesheets/sites/select2.less
index ea408e3..4911168 100644
--- a/client/stylesheets/sites/select2.less
+++ b/client/stylesheets/sites/select2.less
@@ -1,4 +1,4 @@
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-selection-limit {
background: none;
diff --git a/client/stylesheets/sites/updates.less b/client/stylesheets/sites/updates.less
index a73a931..3725b12 100644
--- a/client/stylesheets/sites/updates.less
+++ b/client/stylesheets/sites/updates.less
@@ -1,4 +1,4 @@
-@import "_variables.import.less";
+@import "../bootstrap-variables.less";
.update-title {
color: @brand-primary;
diff --git a/client/stylesheets/style.less b/client/stylesheets/style.less
index 77da354..ca180be 100644
--- a/client/stylesheets/style.less
+++ b/client/stylesheets/style.less
@@ -1,7 +1,3 @@
-// Import Vendors
-@import "vendor/custom.bootstrap.mixins.import.less";
-@import "vendor/custom.bootstrap.import.less";
-
// Sites
@import "sites/_style.less";
@import "sites/about.less";
diff --git a/client/stylesheets/vendor/.gitignore b/client/stylesheets/vendor/.gitignore
deleted file mode 100644
index 7650e7a..0000000
--- a/client/stylesheets/vendor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-custom.bootstrap.less
-custom.bootstrap.mixins.import.less
diff --git a/client/stylesheets/vendor/custom.bootstrap.json b/client/stylesheets/vendor/custom.bootstrap.json
deleted file mode 100644
index b497657..0000000
--- a/client/stylesheets/vendor/custom.bootstrap.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{"modules": {
- "normalize": true,
- "print": true,
-
- "scaffolding": true,
- "type": true,
- "code": true,
- "grid": true,
- "tables": true,
- "forms": true,
- "buttons": true,
-
- "glyphicons": true,
- "button-groups": true,
- "input-groups": true,
- "navs": true,
- "navbar": true,
- "breadcrumbs": true,
- "pagination": true,
- "pager": true,
- "labels": true,
- "badges": true,
- "jumbotron": true,
- "thumbnails": true,
- "alerts": true,
- "progress-bars": true,
- "media": true,
- "list-group": true,
- "panels": true,
- "responsive-embed": true,
- "wells": true,
- "close": true,
-
- "component-animations": true,
- "dropdowns": true,
- "modals": true,
- "tooltip": true,
- "popovers": true,
- "carousel": true,
-
- "affix": true,
- "alert": true,
- "button": true,
- "collapse": true,
- "scrollspy": true,
- "tab": true,
- "transition": true,
-
- "utilities": true,
- "responsive-utilities": true
-}}
diff --git a/client/views/admin/admin.html b/client/views/admin/admin.html
old mode 100644
new mode 100755
index aaef51d..740423b
--- a/client/views/admin/admin.html
+++ b/client/views/admin/admin.html
@@ -9,6 +9,7 @@
Users Settings Petition tags Interface
+ {{#if publicSettings.ui.roles_locked}}
+
+ Heads up! Users are automatically added and removed from groups when they log into the site. Change someone's LDAP groups if you want them to be an admin or a moderator.
+
+ {{/if}}
Admins
Administrators can manage user roles and petitions.
@@ -43,9 +50,9 @@
Notifiers
-
+
Settings
-
+
Minimum Signature Threshold: Changing the threshold only affects future petitions.
+ {{> moderationButton}}
@@ -78,7 +86,7 @@
Petition Tags
value="{{this.name}}"
disabled>
- X
+ ×
@@ -100,47 +108,108 @@
Petition Tags
+
+
+
User Interface
+
Manage UI settings.
+
+
+
+
+
{{#each users}}
+ {{#if publicSettings.ui.roles_locked}}
+ {{profile.name}} - {{username}}
+ {{else}}
+
+ {{/if}}
+ {{/each}}
+ {{#unless publicSettings.ui.roles_locked}}
- {{/each}}
-
-
\ No newline at end of file
+ {{/unless}}
+
diff --git a/client/views/admin/admin.js b/client/views/admin/admin.js
old mode 100644
new mode 100755
index eeea2e8..e2cbeda
--- a/client/views/admin/admin.js
+++ b/client/views/admin/admin.js
@@ -1,9 +1,7 @@
Template.admin.events({
'submit #thresholdForm': function (e) {
e.preventDefault();
-
var threshold = $(e.target).find('[name=minimumThreshold]').val();
-
Meteor.call('changeMinimumThreshold', threshold, function (error) {
if (error) {
throwError(error.reason);
@@ -32,7 +30,7 @@ Template.admin.events({
}
})
},
- 'submit form': function(e) {
+ 'submit #users form': function(e) {
e.preventDefault();
var username,
@@ -58,4 +56,43 @@ Template.admin.events({
}
});
}
-});
\ No newline at end of file
+});
+
+Template.interface.events({
+ 'submit #changeParallax': function(e){
+ e.preventDefault();
+ Meteor.call('toggleParallax');
+ },
+ 'submit #changePetitionHistoryDisplay': function(e){
+ e.preventDefault();
+ Meteor.call('togglePetitionHistoryDisplay');
+ },
+ 'submit #changeUpdateAuthorDisplay': function(e){
+ e.preventDefault();
+ Meteor.call('toggleUpdateAuthorDisplay');
+ }
+});
+
+Template.interface.helpers({
+ 'parallaxStyle' : function(){
+ if(Singleton.findOne().parallax){
+ return 'Enabled'
+ }else{
+ return 'Disabled'
+ }
+ },
+ 'petitionHistoryDisplayStyle' : function(){
+ if(Singleton.findOne().petitionHistoryDisplay){
+ return 'Enabled'
+ }else{
+ return 'Disabled'
+ }
+ },
+ 'updateAuthorDisplayStyle' : function(){
+ if(Singleton.findOne().updateAuthorDisplay){
+ return 'Enabled'
+ }else{
+ return 'Disabled'
+ }
+ }
+});
diff --git a/client/views/admin/moderatePage.html b/client/views/admin/moderatePage.html
new file mode 100644
index 0000000..cf1220b
--- /dev/null
+++ b/client/views/admin/moderatePage.html
@@ -0,0 +1,15 @@
+
+
+ {{> moderationButton}}
+
+ {{> petitionGroup petitions=petitions
+ petitionOrder=petitionOrder
+ title="Pending Approval"
+ description="These petitions are currently being evaluated for submission"
+ nopetitions="No petitions are currently pending."
+ pending=true
+ }}
+
+
diff --git a/client/views/admin/moderationButton.html b/client/views/admin/moderationButton.html
new file mode 100644
index 0000000..ecc9919
--- /dev/null
+++ b/client/views/admin/moderationButton.html
@@ -0,0 +1,25 @@
+
+
+ {{#if isInRole 'admin'}}
+
+
Moderation Enabled/Disabled: Changing the moderation only affects future petitions.
+
+
diff --git a/client/views/admin/moderationButton.js b/client/views/admin/moderationButton.js
new file mode 100644
index 0000000..69be7d5
--- /dev/null
+++ b/client/views/admin/moderationButton.js
@@ -0,0 +1,16 @@
+Template.moderationButton.events({
+ 'submit #changeModeration': function(e){
+ e.preventDefault();
+ Meteor.call('toggleModeration');
+ }
+});
+
+Template.moderationButton.helpers({
+ 'moderationStyle' : function(){
+ if(Singleton.findOne().moderation){
+ return 'Enabled'
+ }else{
+ return 'Disabled'
+ }
+ }
+});
diff --git a/client/views/application/index.html b/client/views/application/index.html
index 49ed595..68e6699 100644
--- a/client/views/application/index.html
+++ b/client/views/application/index.html
@@ -1,4 +1,4 @@
{{> carousel}}
- {{> postsList}}
-
\ No newline at end of file
+ {{> petitionsList}}
+
diff --git a/client/views/application/layout.html b/client/views/application/layout.html
old mode 100644
new mode 100755
index 4818402..add668f
--- a/client/views/application/layout.html
+++ b/client/views/application/layout.html
@@ -1,8 +1,9 @@
{{> header}}
- {{> yield}}
- {{> footer}}
- {{> login}}
- {{> postSearch}}
- {{> errors}}
-
\ No newline at end of file
+
+ {{> yield}}
+ {{> footer}}
+ {{> login}}
+ {{> errors}}
+
+
diff --git a/client/views/includes/carousel.html b/client/views/includes/carousel.html
index e5bcc8e..113fe77 100644
--- a/client/views/includes/carousel.html
+++ b/client/views/includes/carousel.html
@@ -1,23 +1,23 @@
-
+
- MAKE YOUR MARK.
+ PawPrints
Create and vote on petitions.
-
Receive official responses from Student Government.
+
Track their progress and share with friends.
+
Receive responses and updates.
+
+ Search Petitions
+
-
-
-
- Search Petitions
-
-
+
+
-
\ No newline at end of file
+
diff --git a/client/views/includes/carousel.js b/client/views/includes/carousel.js
old mode 100644
new mode 100755
index 57aa25c..bb2d824
--- a/client/views/includes/carousel.js
+++ b/client/views/includes/carousel.js
@@ -8,8 +8,11 @@ Template.carousel.events = {
}
Template.carousel.rendered = function onCarouselRendered() {
- var stock_images = ['carousel_1.png', 'carousel_2.png', 'carousel_3.png'];
+ var stock_images = _.get(Meteor, 'settings.public.ui.carousel_images', ['/carousel_1.png', '/carousel_2.png', '/carousel_3.png']);
var random = stock_images[Math.floor(Math.random() * stock_images.length)];
$('.carousel').css('background-image', 'url(' + random + ')');
+ if(Singleton.findOne().parallax){
+ $('.carousel').css('background-attachment', 'fixed');
+ }
return;
-}
\ No newline at end of file
+}
diff --git a/client/views/includes/footer.html b/client/views/includes/footer.html
index 863f8e8..29c58af 100644
--- a/client/views/includes/footer.html
+++ b/client/views/includes/footer.html
@@ -7,11 +7,11 @@
About
- PawPrints is a place for sparking change at RIT. Share ideas with the RIT community and influence decision making.
+ PawPrints is the place to spark positive change in your community. Developed by students at the Rochester Institute of Technology .
- © Student Government 2014.
+ © RIT Student Government 2016.
@@ -19,6 +19,11 @@
Available on GitHub.
+
+
@@ -44,10 +49,10 @@
Petitions
- {{ singleton.postsCount }}
+ {{ singleton.petitionsCount }}
\ No newline at end of file
+
diff --git a/client/views/includes/header.html b/client/views/includes/header.html
index b0750b7..4895d39 100644
--- a/client/views/includes/header.html
+++ b/client/views/includes/header.html
@@ -1,5 +1,5 @@
-
\ No newline at end of file
+
diff --git a/client/views/includes/header.js b/client/views/includes/header.js
old mode 100644
new mode 100755
index 43377bc..1ab924f
--- a/client/views/includes/header.js
+++ b/client/views/includes/header.js
@@ -1,8 +1,25 @@
-Template.header.events({
- 'click .navbar-search': function () {
- $('#modal-search').modal();
- setTimeout( function() {
- $('#search').focus();
- }, 500);
+Template.header.helpers({
+
+ 'moderationEnabled' : function(){
+ var enabled = false;
+ if(Singleton.findOne()){
+ enabled = Singleton.findOne().moderation;
+ }
+ var admin = Roles.userIsInRole(Meteor.user(), ['admin']);
+ var moderator = Roles.userIsInRole(Meteor.user(), ['moderator']);
+ if(enabled &&(admin || moderator)){
+ return true;
+ }else{
+ return admin;
+ }
}
-});
\ No newline at end of file
+})
+
+//Collapses the navbar when navigating.
+//In a traditional application, the state would be reset on navigation.
+//Becuase the page is not reloaded, navbar needs to be manually collapsed.
+$(document).on('click.nav','.navbar-collapse.in',function(e){
+ if( $(e.target).is('a') ) {
+ $(this).collapse('hide');
+ }
+});
diff --git a/client/views/petitions/action_bar.html b/client/views/petitions/action_bar.html
new file mode 100644
index 0000000..5186322
--- /dev/null
+++ b/client/views/petitions/action_bar.html
@@ -0,0 +1,105 @@
+
+
+ {{#if petition.pending}}
+
Approve Petition
+
+ Reject petition
+ {{/if}}
+ {{#if petition.response}}
+
Great Work!
+
This petition has received an official response.
+ {{else}}
+
Support
+
+ {{/if}}
+
Share
+
+
+ {{#if petition.response}}
+
Signatures
+
+ {{petition.votes}} of
+
+
+
+ {{petition.minimumVotes}} signatures needed
+
+ {{else}}
+
Track
+
+ {{#if updates}}
+
Student Government is aware of and actively working on responding to this petition.
+ {{/if}}
+
+ {{petition.votes}} of
+
+
+
+ {{petition.minimumVotes}} signatures needed
+
+ {{/if}}
+
+
Details
+
+
+
+ Status
+
+
+
+ {{ petitionStatus.title }}
+
+
+
+
+ {{#if equal this.petition.status undefined}}
+
+
{{mustReachDate}}
+ {{/if}}
+
+
+
SUBMITTED
+
{{submittedDate}}
+ {{#if equal this.petition.status undefined}}
+
+
{{mustReachDate}}
+ {{/if}}
+
+
+
+
diff --git a/client/views/petitions/action_bar.js b/client/views/petitions/action_bar.js
new file mode 100644
index 0000000..fd4b0e2
--- /dev/null
+++ b/client/views/petitions/action_bar.js
@@ -0,0 +1,65 @@
+var social_links = {
+ 'facebook': 'https://www.facebook.com/sharer/sharer.php?u=',
+ 'twitter': 'https://twitter.com/intent/tweet?url=',
+ 'reddit': 'http://www.reddit.com/submit?url=',
+ 'plus': 'https://plus.google.com/share?url=',
+ 'linkedin': 'https://www.linkedin.com/cws/share?url='
+};
+
+Template.actionBar.helpers({
+ 'progress': function () {
+ if (this.petition.votes > this.petition.minimumVotes) {
+ return 100;
+ } else {
+ return (this.petition.votes / this.petition.minimumVotes) * 100;
+ }
+ },
+ 'goalReachedClass': function () {
+ return this.petition.votes >= this.petition.minimumVotes ? 'goal-reached' : '';
+ },
+ 'mustReachDate': function() {
+ return new moment(this.petition.submitted).add(1, 'month').format('ll');
+ },
+ 'submittedDate': function(){
+ return moment(this.petition.submitted).format('ll');
+ },
+ 'petitionStatus': function () {
+ var petition = Petitions.findOne();
+ if (petition.status == "waiting-for-reply") {
+ return {
+ title: "In Progress",
+ description: "This petition is being reviewed by Student Government."
+ };
+ } else if (petition.status == "responded") {
+ return {
+ title: "Responded",
+ description: "This petition has recieved an official response."
+ };
+ } else {
+ if (petition.votes >= petition.minimumVotes) {
+ return {
+ title: "Goal Met",
+ description: "This petition has met its signature goal, but has not yet been reviewed by Student Government."
+ };
+ } else if (moment(petition.submitted).isBefore(moment().subtract(1, 'month'))) {
+ return {
+ title: "Expired",
+ description: "This petition didn't meet it's minimum signature goal within one month."
+ };
+ } else {
+ return {
+ title: "Goal Not Met",
+ description: "This petition is below its signature threshold of " + petition.minimumVotes + "."
+ };
+ }
+ }
+ }
+});
+Template.actionBar.events({
+ 'click *[social]': function (e) {
+ var network = $(e.currentTarget).attr("social");
+ var url = social_links[network] + this.url;
+ GAnalytics.event("petition", "share", network);
+ window.open(url);
+ }
+});
diff --git a/client/views/petitions/header_carousel.html b/client/views/petitions/header_carousel.html
new file mode 100644
index 0000000..dd12349
--- /dev/null
+++ b/client/views/petitions/header_carousel.html
@@ -0,0 +1,11 @@
+
+
+
+
+
{{title}}
+ {{description}}
+
+
+
+
diff --git a/client/views/petitions/header_carousel.js b/client/views/petitions/header_carousel.js
new file mode 100755
index 0000000..9a3888f
--- /dev/null
+++ b/client/views/petitions/header_carousel.js
@@ -0,0 +1,10 @@
+Template.headerCarousel.rendered = function onHeaderCarouselRendered() {
+ var stock_images = _.get(Meteor, 'settings.public.ui.carousel_images', ['/carousel_1.png', '/carousel_2.png', '/carousel_3.png']);
+ var random = stock_images[Math.floor(Math.random() * stock_images.length)];
+ $('.campus-carousel').css('background-image', 'url(' + random + ')');
+ if(Singleton.findOne().parallax){
+ $('.campus-carousel').css('background-attachment', 'fixed');
+ }
+ console.log("background selected");
+ return;
+}
diff --git a/client/views/petitions/petition_card.html b/client/views/petitions/petition_card.html
new file mode 100755
index 0000000..6cffd26
--- /dev/null
+++ b/client/views/petitions/petition_card.html
@@ -0,0 +1,48 @@
+
+
+
+
+ {{pluralize petition.votes "Signature"}}
+
+ {{#if signedByUser petition}}
+
+ {{/if}}
+
+
+ {{#each petition.tag_ids}}
+ {{#with tag this}}
+ {{#if isExpired ../..}}
+ {{#if isResponded ../../..}}
+ {{upcase this.name}}
+ {{else}}
+ {{upcase this.name}}
+ {{/if}}
+ {{else}}
+ {{upcase this.name}}
+ {{/if}}
+ {{/with}}
+ {{/each}}
+
+ {{#if petition.pending}}
+
+ {{/if}}
+
+
diff --git a/client/views/petitions/petition_card.js b/client/views/petitions/petition_card.js
new file mode 100755
index 0000000..a25fac3
--- /dev/null
+++ b/client/views/petitions/petition_card.js
@@ -0,0 +1,26 @@
+Template.petitionCard.events({
+ 'click .card-tag': function(e){
+ Session.set('activeTag', e.target.name);
+ },
+});
+
+Template.petitionCard.helpers({
+ isExpired: function(e) {
+ if(moment(e.petition.submitted).isBefore(moment().subtract(1, 'month'))) {
+ return true;
+ }
+ else {
+ return false;
+ }
+ },
+ signedByUser: function(petition) {
+ return Meteor.user() && _.contains(petition.upvoters, Meteor.user()._id);
+ },
+ isResponded: function(e) {
+ if (e.status == "responded"){
+ return true;
+ }else{
+ return false;
+ }
+ }
+});
diff --git a/client/views/posts/post_edit.html b/client/views/petitions/petition_edit.html
similarity index 76%
rename from client/views/posts/post_edit.html
rename to client/views/petitions/petition_edit.html
index 5c4f844..51e57c1 100644
--- a/client/views/posts/post_edit.html
+++ b/client/views/petitions/petition_edit.html
@@ -1,4 +1,4 @@
-
+
@@ -7,9 +7,9 @@
Edit Petition
Back to Petition
+ href="{{pathFor 'petitionPage' _id=petition._id}}">Back to Petition
-
Petition "{{post.title}}" currently has {{pluralize post.votes "signature"}}.
+
Petition "{{petition.title}}" currently has {{pluralize petition.votes "signature"}}.
@@ -52,53 +52,41 @@
maxlength="70"
placeholder="My Petition's Name"
type="text"
- value="{{ post.title }}">
+ value="{{ petition.title }}">
Tags
Description
-
+
Status Updates
Use status updates for information regarding in-progress activities, e.g., committees formed as a result of the petition, or reachout efforts to Administrators.
-
If a new status update is created, an e-mail will be dispatched to petition signers who subscribe to status updates.
+
If a new status update is created, an e-mail will be dispatched to petition signatories who subscribe to status updates.
{{#each updates}}
- {{> createUpdate update=this post=../post }}
+ {{> createUpdate update=this petition=../petition }}
{{/each}}
- {{> createUpdate update=newUpdate post=post user=user }}
+ {{> createUpdate update=newUpdate petition=petition user=user }}
Response
Use response for the final petition update, e.g., the final decision reached by Administration, the consensus reached by the committee formed for the petition, etc.
-
When a response is initially posted, an e-mail is dispatched to petition signers who subscribe to updates.
+
When a response is initially petitioned, an e-mail is dispatched to petition signatories who subscribe to updates.
-
-
+
+
- {{#with post}}
+ {{#with petition}}
Publish Status
This petition is currently {{publishStatus}} . Published petitions are publicly viewable and accessible via the API; unpublished petitions are only visible to administrators and not accessible via the API.
@@ -114,7 +102,7 @@
-
+
Save Petition
diff --git a/client/views/posts/post_edit.js b/client/views/petitions/petition_edit.js
similarity index 58%
rename from client/views/posts/post_edit.js
rename to client/views/petitions/petition_edit.js
index ef4ff29..d7ff62b 100644
--- a/client/views/posts/post_edit.js
+++ b/client/views/petitions/petition_edit.js
@@ -1,40 +1,50 @@
-Template.postEdit.events({
+Template.petitionEdit.events({
'submit #petitionForm': function(e) {
e.preventDefault();
- var postProperties = {
+ var styled_description = $('#summernote1').summernote('code');
+ styled_response = null;
+ if ($('#summernote3').summernote('isEmpty') == false){
+ styled_response = $('#summernote3').summernote('code');
+ }
+ var petitionProperties = {
title: $(e.target).find('[name=title]').val(),
- description: $(e.target).find('[name=description]').val(),
- response: $(e.target).find('[name=response]').val(),
+ description: styled_description,
+ response: styled_response,
tag_ids: _.pluck($('#s2id_tags').select2('data'), '_id')
};
- Meteor.call('edit', this.post._id, postProperties, function (err) {
+ Meteor.call('edit', this.petition._id, petitionProperties, function (err) {
if (err) {
- GAnalytics.event("post", "edit", err.reason);
+ GAnalytics.event("petition", "edit", err.reason);
throwError(err.reason);
} else {
throwError("Petition saved.");
- GAnalytics.event("post", "edit");
+ GAnalytics.event("petition", "edit");
}
});
},
'click .delete-petition': function(e) {
e.preventDefault();
if (confirm("Delete this petition? Consider unpublishing it instead.")) {
- Meteor.call('delete', this.post._id, function (err) {
+ Meteor.call('delete', this.petition._id, function (err) {
if (err) {
- GAnalytics.event("post", "delete", err.reason);
+ GAnalytics.event("petition", "delete", err.reason);
throwError(err.reason);
} else {
- GAnalytics.event("post", "delete");
- Router.go('postsList');
+ GAnalytics.event("petition", "delete");
+ Router.go('petitionsList');
}
});
}
}
});
-Template.postEdit.rendered = function () {
+Template.petitionEdit.rendered = function () {
var _this = this;
+ $('#summernote1').summernote();
+ $('#summernote2').summernote();
+ $('#summernote3').summernote();
+ $('#summernote1').summernote('code', this.data.petition.description);
+ $('#summernote3').summernote('code', this.data.petition.response);
Deps.autorun(function () {
$('#tags').select2({
placeholder: "Petition Tags",
@@ -47,7 +57,7 @@ Template.postEdit.rendered = function () {
formatResult: function (object, container, query) { return object.name; },
formatNoMatches: function (object) { return "No tags found." },
formatSelectionTooBig: function (object) { return "You can only select up to 3 tags." }
- }).select2('val', _.pluck(Tags.find({_id: {$in: this.data.post.tag_ids}}).fetch(), '_id'));
+ }).select2('val', _.pluck(Tags.find({_id: {$in: this.data.petition.tag_ids}}).fetch(), '_id'));
$('.select2-search-field>input').addClass("input");
}.bind(this));
};
@@ -57,10 +67,10 @@ Template.petitionPublish.events({
e.preventDefault();
Meteor.call('changePublishStatus', this._id, function (err) {
if (err) {
- GAnalytics.event("post", "changePublishStatus", err.reason);
+ GAnalytics.event("petition", "changePublishStatus", err.reason);
throwError(err.reason);
} else {
- GAnalytics.event("post", "changePublishStatus");
+ GAnalytics.event("petition", "changePublishStatus");
}
});
}
diff --git a/client/views/petitions/petition_page.html b/client/views/petitions/petition_page.html
new file mode 100755
index 0000000..bf3ef52
--- /dev/null
+++ b/client/views/petitions/petition_page.html
@@ -0,0 +1,92 @@
+
+
+
+
{{petition.title}}
+
+ {{#each petition.tag_ids}}
+ {{#with tag this}}
+ {{upcase this.name}}
+ {{/with}}
+ {{/each}}
+ {{#if isInRole 'admin' 'moderator'}}
+ EDIT
+
+
Petition by {{petition.author}}
+ {{#if show_history}}
+ {{#if updates}}
+ {{#each updates}}
+
Update by {{this.author}}
+ {{/each}}
+ {{/if}}
+ {{/if}}
+
+
+
+
+
+ {{#if petition.response}}
+
+
+
+
Official Response
+
{{ responded_at }}
+
+
{{{breaklines petition.response }}}
+
+
+
+ {{/if}}
+
+
+
+ {{#if updates}}
+ {{#each updates}}
+
+ {{> updateBlurb}}
+
+ {{/each}}
+ {{/if}}
+
+
+
+ Description
+ {{ submitted_at }}
+
+
+
{{{breaklines petition.description}}}
+
+
+
+ {{> actionBar}}
+
+
+
+
Signed by
+
+
+
+
+ {{#each initials}}
+ {{ this }}
+
+
+
+
+
+
+ {{> actionBar}}
+
+
+
diff --git a/client/views/petitions/petition_page.js b/client/views/petitions/petition_page.js
new file mode 100644
index 0000000..e003534
--- /dev/null
+++ b/client/views/petitions/petition_page.js
@@ -0,0 +1,52 @@
+var timeTick = new Deps.Dependency();
+
+Meteor.setInterval(function () {
+ timeTick.changed();
+}, 1000);
+
+Template.petitionPage.helpers({
+ 'responded_at': function () {
+ timeTick.depend();
+ return new moment(this.petition.responded_at).fromNow();
+ },
+ 'responded_date':function(){
+ return new moment(this.petition.responded_at).format('MMMM Do YYYY, h:mm a');
+ },
+ 'submitted_at': function () {
+ timeTick.depend();
+ return new moment(this.petition.submitted).fromNow();
+ },
+ 'submitted_date': function () {
+ return new moment(this.petition.submitted).format('MMMM Do YYYY, h:mm a');
+ },
+ 'initials': function () {
+ return Meteor.users.find({
+ '_id': {
+ $in: this.petition.upvoters
+ }
+ }).fetch().map(function (user) {
+ if (!user.profile.initials) {
+ return "Unknown";
+ } else {
+ return user.profile.initials;
+ }
+ });
+ },
+ 'show_history': function () {
+ return Singleton.findOne().petitionHistoryDisplay;
+ }
+});
+
+Template.petitionPage.events({
+ 'click #approve' : function(e){
+ e.preventDefault();
+ var _id = this.petition._id
+ Meteor.call('changePendingPetition', _id, true, function(error) {
+ if (error) {
+ throwError(error.reason);
+ } else {
+ throwError(result);
+ }
+ });
+ }
+});
diff --git a/client/views/petitions/petition_reject.html b/client/views/petitions/petition_reject.html
new file mode 100644
index 0000000..b98b6e6
--- /dev/null
+++ b/client/views/petitions/petition_reject.html
@@ -0,0 +1,39 @@
+
+
+
diff --git a/client/views/petitions/petition_reject.js b/client/views/petitions/petition_reject.js
new file mode 100644
index 0000000..4a15982
--- /dev/null
+++ b/client/views/petitions/petition_reject.js
@@ -0,0 +1,20 @@
+Template.petitionReject.events({
+ 'submit form': function(e){
+ e.preventDefault();
+ var reason = $('textarea[name=rejectReason]').val();
+ if(reason.length == 0){
+ throwError("Must have a message to reject!");
+ }else{
+ var _id = this.petition._id
+ Meteor.call('changePendingPetition', _id, false, reason, function(error, result) {
+ if (error) {
+ throwError(error.reason);
+ } else {
+ setTimeout( function() { $('#petitionRejectModal').modal("hide") }, 1000);
+ throwError(result);
+ }
+ });
+ }
+
+ }
+});
diff --git a/client/views/posts/post_report.html b/client/views/petitions/petition_report.html
similarity index 96%
rename from client/views/posts/post_report.html
rename to client/views/petitions/petition_report.html
index 143f1d7..8182f1f 100644
--- a/client/views/posts/post_report.html
+++ b/client/views/petitions/petition_report.html
@@ -1,6 +1,6 @@
-
+
Why are you reporting this petition?
\ No newline at end of file
+
diff --git a/client/views/posts/post_report.js b/client/views/petitions/petition_report.js
similarity index 58%
rename from client/views/posts/post_report.js
rename to client/views/petitions/petition_report.js
index 8ab6660..cb3e0b4 100644
--- a/client/views/posts/post_report.js
+++ b/client/views/petitions/petition_report.js
@@ -1,10 +1,10 @@
-Template.postReport.events({
+Template.petitionReport.events({
'submit form': function (e) {
e.preventDefault();
Session.set("waiting", true);
- var _id = this.post._id,
+ var _id = this.petition._id,
reason = $("input[name='report-reason']:checked").val();
Meteor.call('report', _id, reason, function(error) {
@@ -13,12 +13,12 @@ Template.postReport.events({
if (error) {
throwError(error.reason);
- GAnalytics.event("post", "report", error.reason);
+ GAnalytics.event("petition", "report", error.reason);
} else {
throwError("Petition reported.");
- setTimeout( function() { $('#postReportModal').modal("hide") }, 1000);
- GAnalytics.event("post", "report", _id);
+ setTimeout( function() { $('#petitionReportModal').modal("hide") }, 1000);
+ GAnalytics.event("petition", "report", _id);
}
});
}
-});
\ No newline at end of file
+});
diff --git a/client/views/posts/post_share_modal.html b/client/views/petitions/petition_share_modal.html
similarity index 91%
rename from client/views/posts/post_share_modal.html
rename to client/views/petitions/petition_share_modal.html
index afca4ad..a9e82bf 100644
--- a/client/views/posts/post_share_modal.html
+++ b/client/views/petitions/petition_share_modal.html
@@ -1,6 +1,6 @@
-
+
More Signatures Needed
You're only {{pluralize signaturesRemaining "signature"}}{{percentRemaining}} away from an official response!
-
Share this petition to increase your chances of reaching {{pluralize post.minimumVotes "signature"}}.
+
Share this petition to increase your chances of reaching {{pluralize petition.minimumVotes "signature"}}.
More Signatures Needed
-
\ No newline at end of file
+
diff --git a/client/views/petitions/petition_share_modal.js b/client/views/petitions/petition_share_modal.js
new file mode 100644
index 0000000..a61ab67
--- /dev/null
+++ b/client/views/petitions/petition_share_modal.js
@@ -0,0 +1,9 @@
+Template.petitionShareModal.helpers({
+ signaturesRemaining: function () {
+ return this.petition.minimumVotes - this.petition.votes;
+ },
+ percentRemaining: function () {
+ var percent = parseInt((this.petition.minimumVotes - this.petition.votes) / this.petition.minimumVotes * 100);
+ return percent < 40 ? " (" + percent + "%)" : "";
+ }
+});
diff --git a/client/views/petitions/petition_sign.html b/client/views/petitions/petition_sign.html
new file mode 100644
index 0000000..5c5abf3
--- /dev/null
+++ b/client/views/petitions/petition_sign.html
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
diff --git a/client/views/petitions/petition_sign.js b/client/views/petitions/petition_sign.js
new file mode 100644
index 0000000..17b86bf
--- /dev/null
+++ b/client/views/petitions/petition_sign.js
@@ -0,0 +1,92 @@
+Template.petitionSign.events({
+ 'submit form': function(e) {
+ e.preventDefault();
+ var petition = this.petition;
+ var sign = function () {
+ Meteor.call('sign', petition._id, function(error) {
+ if (error)
+ throwError(error.reason);
+ else {
+ var signaturesNeeded = petition.minimumVotes - petition.votes;
+ if (signaturesNeeded >= 1) {
+ $('#petitionShareModal').modal('show');
+ }
+ }
+ });
+ };
+ if (Meteor.userId()) {
+ sign();
+ } else {
+ Session.set("loginMsg", "Please login to sign.");
+ $('#loginModal').modal('show');
+ $('#loginModal').on('hidden.bs.modal', function () {
+ if (Meteor.userId())
+ sign();
+ });
+ }
+ }
+});
+
+Template.petitionSub.events({
+ 'submit form': function(e) {
+ e.preventDefault();
+ var petition = this.petition;
+ var sub = function () {
+ Meteor.call('subscribe', petition._id, function(error) {
+ if (error)
+ throwError(error.reason);
+ });
+ };
+ if (Meteor.userId()) {
+ sub();
+ } else {
+ Session.set("loginMsg", "Please login to subscribe.");
+ $('#loginModal').modal('show');
+ $('#loginModal').on('hidden.bs.modal', function () {
+ if (Meteor.userId())
+ sub();
+ });
+ }
+ }
+});
+
+Template.petitionSub.helpers({
+ subscribedClass: function() {
+ var userId = Meteor.userId();
+ if (userId && this.petition && _.include(this.petition.subscribers, userId)) {
+ return 'disabled';
+ } else {
+ return '';
+ }
+ },
+ subscribeBtnText: function() {
+ var userId = Meteor.userId();
+ if (userId && this.petition && _.include(this.petition.subscribers, userId)) {
+ return 'Subscribed';
+ } else {
+ return 'Subscribe';
+ }
+ }
+})
+
+Template.petitionSign.helpers({
+ signedClass: function() {
+ var userId = Meteor.userId();
+ if (userId && this.petition && _.include(this.petition.upvoters, userId) ||
+ moment(this.petition.submitted).isBefore(moment().subtract(1, 'month'))) {
+ return 'disabled';
+ } else {
+ return '';
+ }
+ },
+ btnText: function() {
+ var userId = Meteor.userId();
+ if (userId && this.petition && _.include(this.petition.upvoters, userId)) {
+ return 'Signed';
+ } else if (moment(this.petition.submitted).isBefore(moment().subtract(1, 'month'))) {
+ return 'Expired';
+ } else {
+ return 'Add My Name';
+ }
+ }
+});
diff --git a/client/views/petitions/petition_submit.html b/client/views/petitions/petition_submit.html
new file mode 100644
index 0000000..2966256
--- /dev/null
+++ b/client/views/petitions/petition_submit.html
@@ -0,0 +1,43 @@
+
+
+
diff --git a/client/views/petitions/petition_submit.js b/client/views/petitions/petition_submit.js
new file mode 100755
index 0000000..8171646
--- /dev/null
+++ b/client/views/petitions/petition_submit.js
@@ -0,0 +1,124 @@
+//This function is called by event handlers and is debounced by a few milliseconds. Since the Session is reactive,
+//if this is not debounced, a user could have their text overwritten by what was just put in the session a few milliseconds ago.
+var savePetitionSessionState = function() {
+ Session.set('petition.title', $('*[name=title]').val());
+ Session.set('petition.description', $('textarea[name=description]').val());
+ Session.set('petition.tag_ids', _.pluck($('#s2id_tags').select2('data'), '_id'));
+};
+
+Template.petitionSubmit.helpers({
+ 'emptyPetition': function() {
+
+ return {
+ votes: 1,
+ author: Meteor.user().profile.name,
+ title: Session.get('petition.title'),
+ tag_ids: Session.get('petition.tag_ids')
+ }
+ },
+ 'title': function() {
+ return Session.get('petition.title');
+ },
+ 'author': function() {
+ return Meteor.user().profile.displayName;
+ }
+});
+
+Template.petitionSubmit.helpers({
+ 'respondedPetition': function() {
+
+ return {
+ votes: 1,
+ author: Meteor.user().profile.name,
+ title: Session.get('petition.title'),
+ status: 'responded',
+ tag_ids: Session.get('petition.tag_ids')
+ }
+ },
+ 'title': function() {
+ return Session.get('petition.title');
+ },
+ 'author': function() {
+ return Meteor.user().profile.displayName;
+ }
+});
+Template.petitionSubmit.helpers({
+ 'inProgressPetition': function() {
+
+ return {
+ votes: 1,
+ author: Meteor.user().profile.name,
+ title: Session.get('petition.title'),
+ status: 'waiting-for-reply',
+ tag_ids: Session.get('petition.tag_ids')
+ }
+ },
+ 'title': function() {
+ return Session.get('petition.title');
+ },
+ 'author': function() {
+ return Meteor.user().profile.displayName;
+ }
+});
+
+Template.petitionSubmit.events({
+ 'submit form': function(e) {
+ //Since this function is debounced by event handlers, it may not have run yet. This is to ensure someone doesn't
+ //quickly write up a petition and hammer the enter key before the debounced function is run.
+ savePetitionSessionState();
+ e.preventDefault();
+
+ var markupStr = $('#summernote').summernote('code');
+ var petition = {
+ title: Session.get('petition.title'),
+ description: markupStr,
+ tag_ids: Session.get('petition.tag_ids')
+ }
+
+ Meteor.call('petition', petition, function(error, id) {
+ if (error) {
+ // display the error to the user
+ throwError(error.reason);
+ if (error.error === 302)
+ Router.go('petitionPage', {_id: error.details})
+ } else {
+
+ Session.set('petition.title', '');
+ Session.set('petition.description', '');
+ if(Singleton.findOne().moderation){
+ Router.go('index');
+ throwError("Petition is pending approval, you will receive an email once it has gone thorugh the approval process.");
+ }else{
+ Router.go('petitionPage', {_id: id});
+ }
+ }
+ });
+ },
+ 'keyup *[name=title]': _.debounce(savePetitionSessionState, 250),
+ 'keyup *[name=description]': _.debounce(savePetitionSessionState, 250)
+});
+
+Template.petitionSubmit.rendered = function () {
+ Session.set('petition.tag_ids', []);
+
+ $('#summernote').summernote();
+
+ Deps.autorun(function () {
+ $('#tags').select2({
+ placeholder: "Petition Tags",
+ data: {results: Tags.find({}, {sort: {name: 1}}).fetch()},
+ multiple: true,
+ maximumSelectionSize: 3,
+ id: function (object) { return object._id; },
+ matcher: function(term, text, option) { return option.name.toUpperCase().indexOf(term.toUpperCase()) > -1; },
+ formatSelection: function (object, container) { return object.name.toUpperCase(); },
+ formatResult: function (object, container, query) { return object.name; },
+ formatNoMatches: function (object) { return "No tags found." },
+ formatSelectionTooBig: function (object) { return "You can only select up to 3 tags." }
+ });
+ $('.select2-search-field>input').addClass("input");
+ });
+ $('#tags').on("change", savePetitionSessionState);
+ // Accessing selected tags
+ // $('#s2id_tags').select2('data');
+};
diff --git a/client/views/petitions/petitions_list.html b/client/views/petitions/petitions_list.html
new file mode 100755
index 0000000..fc986a4
--- /dev/null
+++ b/client/views/petitions/petitions_list.html
@@ -0,0 +1,106 @@
+
+
+
+
Open Petitions
+ Petitions that haven't been recognized or resolved.
+
+ {{> petitionGroup petitions=petitions
+ petitionOrder=petitionOrder
+ title="Open/Expired Petitions"
+ tags=tags
+ nopetitions="Be the first to write a petition."
+ displayheader=false}}
+
+
+
+ {{> petitionGroup petitions=petitions
+ petitionOrder=petitionOrder
+ tag=this.tag
+ tags=tags
+ nopetitions="There are no petitions with that tag."
+ displayheader=true }}
+
+
+
+ {{> petitionGroup petitions=petitions
+ petitionOrder=petitionOrder
+ title="Recognized"
+ description="These petitions are currently being worked on. Status updates may be available on the petition page."
+ tags=tags
+ nopetitions="No petitions are currently in progress."
+ displayheader=true }}
+
+
+
+ {{> petitionGroup petitions=petitions
+ petitionOrder=petitionOrder
+ title="Responded"
+ description="These petitions have received responses."
+ tags=tags
+ nopetitions="No petitions have received responses."
+ displayheader=true}}
+
+
+
+
+ {{#if displayheader}}
+ {{> headerCarousel title=tagTitle description=description}}
+ {{/if}}
+
+
+
+ {{#unless pending}}
+
+
+
Sort
+
+ {{#if equal title "Responded"}}
+ Most Recent Responded
+ {{/if}}
+ Most Recent Submitted
+ Last Signed
+ Most Signatures
+
+
Filter
+ {{# if loggedIn}}
+
+ {{/if}}
+
+
+
+ {{/unless}}
+
+ {{#each petitions}}
+ {{> petitionCard petition=this }}
+ {{/each}}
+ {{#if empty petitions}}
+
+ {{/if}}
+
+
+
+
diff --git a/client/views/petitions/petitions_lists.js b/client/views/petitions/petitions_lists.js
new file mode 100755
index 0000000..642ce02
--- /dev/null
+++ b/client/views/petitions/petitions_lists.js
@@ -0,0 +1,60 @@
+Template.petitionGroup.events({
+ 'change #petition-order': function(evt) {
+ Session.set("petitionOrder", evt.currentTarget.value);
+ },
+ 'click #load-more': function () {
+ Session.set('petitionsLimit', Session.get('petitionsLimit') + 12);
+ },
+ 'click .tag-item': function (e) {
+ if(e.target.id == 'all'){
+ Session.set('activeTag', null);
+ }else{
+ Session.set('activeTag', e.target.id);
+ }
+ },
+ 'change #show-signed': function(e) {
+ Session.set('showSigned', $(e.target).is(':checked'));
+ },
+ 'change #show-created': function(e) {
+ Session.set('showCreated', $(e.target).is(':checked'));
+ }
+});
+
+Template.petitionGroup.helpers({
+ 'isActiveTag' : function(name){
+ if((name == Session.get('activeTag')) ||
+ (!Session.get('activeTag') && (name == 'all'))){
+ return 'active';
+ }else{
+ return '';
+ }
+ },
+ 'tagTitle' : function() {
+ if(Session.get('activeTag')){
+ return Session.get('activeTag') + ' Petitions';
+ }else{
+ return this.title;
+ }
+ },
+ 'moderation' : function(){
+ if(Singleton.findOne().moderation){
+ return true;
+ }else{
+ return false;
+ }
+ }
+});
+
+Template.petitionGroup.helpers({
+ 'sortType': function(title){
+ if(title == "Responses"){
+ return "responded_at"
+ }else{
+ return "submitted"
+ }
+ }
+});
+
+Template.petitionGroup.rendered = function () {
+ $('[data-toggle="tooltip"]').tooltip();
+};
diff --git a/client/views/posts/post_card.html b/client/views/posts/post_card.html
deleted file mode 100644
index c7a258a..0000000
--- a/client/views/posts/post_card.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
{{pluralize post.votes "Signature"}}
-
-
- {{#each post.tag_ids}}
- {{#with tag this}}
- {{upcase this.name}}
-
-
diff --git a/client/views/posts/post_page.html b/client/views/posts/post_page.html
deleted file mode 100644
index c17190d..0000000
--- a/client/views/posts/post_page.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
-
{{post.title}}
-
- {{#each post.tag_ids}}
- {{#with tag this}}
- {{upcase this.name}} EDIT
-
-
-
-
-
-
-
-
-
- {{#if post.response}}
-
-
-
-
OFFICIAL RESPONSE - LAST UPDATED {{ responded_at }}
-
{{{breaklines post.response }}}
-
-
-
- {{/if}}
-
- {{#if updates}}
-
-
-
-
STATUS UPDATES
- {{#each updates}}
- {{> updateBlurb}}
- {{/each}}
-
-
-
- {{/if}}
-
-
-
-
-
-
{{{breaklines post.description}}}
-
-
-
-
SIGNED BY
-
{{#each initials}}
- {{ this }}
-
-
-
-
-
-
-
TAKE ACTION
-
-
-
- SIGNATURES ({{post.votes}} / {{post.minimumVotes}})
-
-
-
-
-
-
- {{ petitionStatus.title }}
-
-
-
- {{#if equal this.post.status undefined}}
-
-
{{mustReachDate}}
- {{/if}}
-
-
- Report petition
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client/views/posts/post_page.js b/client/views/posts/post_page.js
deleted file mode 100644
index a7c9ed0..0000000
--- a/client/views/posts/post_page.js
+++ /dev/null
@@ -1,100 +0,0 @@
-var social_links = {
- 'facebook': 'https://www.facebook.com/sharer/sharer.php?u=',
- 'twitter': 'https://twitter.com/intent/tweet?url=',
- 'reddit': 'http://www.reddit.com/submit?url=',
- 'plus': 'https://plus.google.com/share?url=',
- 'linkedin': 'https://www.linkedin.com/cws/share?url='
-};
-
-var timeTick = new Deps.Dependency();
-
-Meteor.setInterval(function () {
- timeTick.changed();
-}, 1000);
-
-
-Template.postPage.helpers({
- 'responded_at': function () {
- timeTick.depend();
- return new moment(this.post.responded_at).fromNow().toUpperCase();
- },
- 'submitted_at': function () {
- timeTick.depend();
- return new moment(this.post.submitted).fromNow().toUpperCase();
- },
- 'initials': function () {
- return Meteor.users.find({
- '_id': {
- $in: this.post.upvoters
- }
- }).fetch().map(function (user) {
- if (!user.profile.initials) {
- return "XYZ";
- } else {
- return user.profile.initials;
- }
- });
- },
- 'progress': function () {
- if (this.post.votes > this.post.minimumVotes) {
- return 100;
- } else {
- return (this.post.votes / this.post.minimumVotes) * 100;
- }
- },
- 'goalReachedClass': function () {
- return this.post.votes >= this.post.minimumVotes ? 'goal-reached' : '';
- },
- 'mustReachDate': function() {
- return new moment(this.post.submitted).add(1, 'month').format('ll');
- },
- 'petitionStatus': function () {
- var post = Posts.findOne();
- if (post.status == "waiting-for-reply") {
- return {
- title: "In Progress",
- description: "This petition is being reviewed by Student Government."
- };
- } else if (post.status == "responded") {
- return {
- title: "Responded",
- description: "This petition has recieved an official response."
- };
- } else {
- if (post.votes >= post.minimumVotes) {
- return {
- title: "Goal Met",
- description: "This petition has met its signature goal, but has not yet been reviewed by Student Government."
- };
- } else if (moment(post.submitted).isBefore(moment().subtract(1, 'month'))) {
- return {
- title: "Expired",
- description: "This petition didn't meet it's minimum signature goal within one month."
- };
- } else {
- return {
- title: "Goal Not Met",
- description: "This petition is below its signature threshold of " + post.minimumVotes + "."
- };
- }
- }
- }
-});
-
-Template.postPage.events({
- 'click *[social]': function (e) {
- var network = $(e.currentTarget).attr("social");
- var url = social_links[network] + this.url;
- GAnalytics.event("post", "share", network);
- window.open(url);
- }
-});
-
-Template.postPage.rendered = function () {
- Deps.autorun( function () {
- var post = Posts.findOne();
- $('.petition-status').tooltip('destroy');
- $('.petition-status').tooltip({title: Template.postPage.__helpers[" petitionStatus"]().description});
- $('.petition-expires').tooltip();
- });
-}
\ No newline at end of file
diff --git a/client/views/posts/post_search.html b/client/views/posts/post_search.html
deleted file mode 100644
index 704827d..0000000
--- a/client/views/posts/post_search.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
diff --git a/client/views/posts/post_search.js b/client/views/posts/post_search.js
deleted file mode 100644
index 55b7d5b..0000000
--- a/client/views/posts/post_search.js
+++ /dev/null
@@ -1,41 +0,0 @@
-Template.postSearch.rendered = function () {
- $('#modal-search').on('shown.bs.modal', function () {
- $('body').css('overflow', 'hidden');
- $('.modal-backdrop').css('opacity', '0.5');
- });
- $('#modal-search').on('hidden.bs.modal', function () {
- $('body').css('overflow', 'visible');
- $('.modal-backdrop').css('opacity', '0');
- $('#search').val("");
- Session.set("results", null);
- });
-};
-
-Template.postSearch.events({
- 'keyup #search': function (e) {
- var query = $(e.target).val();
- if (query.length >= 3) {
- setTimeout( function() {
- Session.set("waiting", true);
- EasySearch.search('posts', query, function (err, data) {
- Session.set("waiting", false);
- Session.set("results", data.results);
- });
- GAnalytics.event("post", "search", query);
- }, 100);
- }
- },
- 'click a': function (e) {
- $('#modal-search').modal("hide");
- }
-});
-
-Template.postSearch.helpers({
- noResults: function() {
- return Session.get('results') && Session.get('results').length == 0;
- }
-});
-
-Template.postSearch.rendered = function () {
- $("#search").attr('autocomplete', 'off');
-}
\ No newline at end of file
diff --git a/client/views/posts/post_share_modal.js b/client/views/posts/post_share_modal.js
deleted file mode 100644
index 8b01efe..0000000
--- a/client/views/posts/post_share_modal.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Template.postShareModal.helpers({
- signaturesRemaining: function () {
- return this.post.minimumVotes - this.post.votes;
- },
- percentRemaining: function () {
- var percent = parseInt((this.post.minimumVotes - this.post.votes) / this.post.minimumVotes * 100);
- return percent < 40 ? " (" + percent + "%)" : "";
- }
-});
\ No newline at end of file
diff --git a/client/views/posts/post_sign.html b/client/views/posts/post_sign.html
deleted file mode 100644
index f397ba0..0000000
--- a/client/views/posts/post_sign.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/client/views/posts/post_sign.js b/client/views/posts/post_sign.js
deleted file mode 100644
index ed64f2d..0000000
--- a/client/views/posts/post_sign.js
+++ /dev/null
@@ -1,50 +0,0 @@
-Template.postSign.events({
- 'submit form': function(e) {
- e.preventDefault();
- var post = this.post;
- var sign = function () {
- Meteor.call('sign', post._id, function(error) {
- if (error)
- throwError(error.reason);
- else {
- var signaturesNeeded = post.minimumVotes - post.votes;
- if (signaturesNeeded >= 1) {
- $('#postShareModal').modal('show');
- }
- }
- });
- };
- if (Meteor.userId()) {
- sign();
- } else {
- Session.set("loginMsg", "Please login to sign.");
- $('#loginModal').modal('show');
- $('#loginModal').on('hidden.bs.modal', function () {
- if (Meteor.userId())
- sign();
- });
- }
- }
-});
-
-Template.postSign.helpers({
- signedClass: function() {
- var userId = Meteor.userId();
- if (userId && this.post && _.include(this.post.upvoters, userId) ||
- moment(this.post.submitted).isBefore(moment().subtract(1, 'month'))) {
- return 'disabled';
- } else {
- return '';
- }
- },
- btnText: function() {
- var userId = Meteor.userId();
- if (userId && this.post && _.include(this.post.upvoters, userId)) {
- return 'Signed';
- } else if (moment(this.post.submitted).isBefore(moment().subtract(1, 'month'))) {
- return 'Expired';
- } else {
- return 'Sign';
- }
- }
-});
diff --git a/client/views/posts/post_submit.html b/client/views/posts/post_submit.html
deleted file mode 100644
index f224470..0000000
--- a/client/views/posts/post_submit.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/client/views/posts/post_submit.js b/client/views/posts/post_submit.js
deleted file mode 100644
index 4288c84..0000000
--- a/client/views/posts/post_submit.js
+++ /dev/null
@@ -1,81 +0,0 @@
-Template.postSubmit.helpers({
- 'emptyPost': function() {
-
- return {
- votes: 1,
- author: Meteor.user().profile.name,
- title: Session.get('post.title'),
- tag_ids: Session.get('post.tag_ids')
- }
- },
- 'title': function() {
- return Session.get('post.title');
- },
- 'author': function() {
- return Meteor.user().profile.displayName;
- }
-});
-
-Template.postSubmit.events({
- 'submit form': function(e) {
- e.preventDefault();
-
- var post = {
- title: Session.get('post.title'),
- description: Session.get('post.description'),
- tag_ids: Session.get('post.tag_ids')
- }
-
- Meteor.call('post', post, function(error, id) {
- if (error) {
- // display the error to the user
- throwError(error.reason);
- if (error.error === 302)
- Router.go('postPage', {_id: error.details})
- } else {
- Session.set('post.title', '');
- Session.set('post.description', '');
- Router.go('postPage', {_id: id});
- }
- });
- },
- 'keyup *[name=title]': function (e) {
- Session.set('post.title', $('*[name=title]').val());
- },
- 'keyup *[name=description]': function (e) {
- Session.set('post.description', $('textarea[name=description]').val());
- }
-});
-
-Template.postSubmit.rendered = function () {
- Session.set('post.tag_ids', []);
- Deps.autorun(function () {
- $('#tags').select2({
- placeholder: "Petition Tags",
- data: {results: Tags.find({}, {sort: {name: 1}}).fetch()},
- multiple: true,
- maximumSelectionSize: 3,
- id: function (object) { return object._id; },
- matcher: function(term, text, option) { return option.name.toUpperCase().indexOf(term.toUpperCase()) > -1; },
- formatSelection: function (object, container) { return object.name.toUpperCase(); },
- formatResult: function (object, container, query) { return object.name; },
- formatNoMatches: function (object) { return "No tags found." },
- formatSelectionTooBig: function (object) { return "You can only select up to 3 tags." }
- });
- $('.select2-search-field>input').addClass("input");
- });
- $('#tags').on("change", function (e) {
- var tag_ids = Session.get('post.tag_ids')
- if (e.added) {
- tag_ids.push(e.added._id);
- Session.set('post.tag_ids', tag_ids);
- } else if (e.removed) {
- var tag_ids = _.without(tag_ids, e.removed._id);
- Session.set('post.tag_ids', tag_ids);
- } else {
- // to-do
- }
- });
- // Accessing selected tags
- // $('#s2id_tags').select2('data');
-};
diff --git a/client/views/posts/posts_list.html b/client/views/posts/posts_list.html
deleted file mode 100644
index 4e83a95..0000000
--- a/client/views/posts/posts_list.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
- {{> petitionGroup posts=posts
- postOrder=postOrder
- title="All Petitions"
- noposts="Be the first to petition your government." }}
-
-
-
-
-
- {{> petitionGroup posts=posts
- postOrder=postOrder
- tag=this.tag
- noposts="There are no petitions with that tag." }}
-
-
-
-
-
- {{> petitionGroup posts=posts
- postOrder=postOrder
- title="In Progress"
- description="These petitions are currently being worked on by Student Government. Status updates may be available on the petition page."
- noposts="No petitions are currently in progress." }}
-
-
-
-
-
- {{> petitionGroup posts=posts
- postOrder=postOrder
- title="Responses"
- description="These petitions have recieved official responses."
- noposts="No petitions have received responses." }}
-
-
-
-
-
-
- {{#if empty posts}}
- {{else}}
-
-
- {{#if this.tag}}
- {{this.tag}} Petitions
- {{else}}
- {{title}}
- {{/if}}
- {{#if description}}
-
- {{/if}}
-
-
-
-
- Sort By
-
- Most Recent
- Most Signatures
-
-
- {{/if}}
- {{#each posts}}
- {{> postCard post=this }}
- {{/each}}
- {{#if empty posts}}
-
- {{/if}}
-
\ No newline at end of file
diff --git a/client/views/posts/posts_lists.js b/client/views/posts/posts_lists.js
deleted file mode 100644
index e803335..0000000
--- a/client/views/posts/posts_lists.js
+++ /dev/null
@@ -1,12 +0,0 @@
-Template.petitionGroup.events({
- 'change #petition-order': function(evt) {
- Session.set("postOrder", evt.currentTarget.value);
- },
- 'click #load-more': function () {
- Session.set('postsLimit', Session.get('postsLimit') + 12);
- }
-});
-
-Template.petitionGroup.rendered = function () {
- $('[data-toggle="tooltip"]').tooltip();
-};
\ No newline at end of file
diff --git a/client/views/search/search.html b/client/views/search/search.html
new file mode 100755
index 0000000..1410da5
--- /dev/null
+++ b/client/views/search/search.html
@@ -0,0 +1,24 @@
+
+
+
diff --git a/client/views/search/search.js b/client/views/search/search.js
new file mode 100755
index 0000000..b935522
--- /dev/null
+++ b/client/views/search/search.js
@@ -0,0 +1,33 @@
+Template.search.events({
+ 'keyup #search': _.debounce(function (e) {
+ console.log('search');
+ var query = $(e.target).val();
+ if (query.length >= 0) {
+ Session.set("waiting", true);
+ var cursor = PetitionsIndex.search(query);
+ Session.set("results", cursor.fetch());
+ Session.set("waiting", false);
+
+ GAnalytics.event("petition", "search", query);
+ }
+ }, 500),
+ 'click a': function (e) {
+ $('#modal-search').modal("hide");
+ },
+ 'submit form': function(event) {
+ event.preventDefault();
+ }
+
+});
+
+Template.search.helpers({
+ noResults: function() {
+ return Session.get('results') && Session.get('results').length == 0;
+ }
+});
+
+Template.search.rendered = function () {
+ $('#search').focus();
+ Session.set("results", null);
+ Session.set("waiting", false);
+}
diff --git a/client/views/static/about.html b/client/views/static/about.html
index eaff9d2..4b8d1d2 100644
--- a/client/views/static/about.html
+++ b/client/views/static/about.html
@@ -1,8 +1,6 @@
-
About
-
@@ -10,9 +8,9 @@
-
Student Government President Ashley Carrington and Vice President Tyler Pierce (2014-2015) sought to improve engagement of RIT Students through a Petition site. The site creates a place for the RIT community to converse on important issues.
-
To remain transparent, this site is an open source project available on GitHub . Additionally, API Access gives the community a convenient way to access the information available through this service.
-
+
PawPrints was developed as free software at the Rochester Institute of Technology by Student Government in 2014.
+
Since 2014, PawPrints has grown to all of RIT's international campuses, RPI, and many more organizations to come.
+
@@ -25,4 +23,4 @@
-
\ No newline at end of file
+
diff --git a/client/views/static/about_template.html b/client/views/static/about_template.html
index 4f14e53..0c826aa 100644
--- a/client/views/static/about_template.html
+++ b/client/views/static/about_template.html
@@ -1,10 +1,11 @@
-
+ {{> headerCarousel title=title description=""}}
+
-
-
\ No newline at end of file
+
diff --git a/client/views/static/about_template.js b/client/views/static/about_template.js
new file mode 100644
index 0000000..a023944
--- /dev/null
+++ b/client/views/static/about_template.js
@@ -0,0 +1,5 @@
+Template.aboutTemplate.helpers({
+ title: function(){
+ return document.title;
+ }
+});
diff --git a/client/views/static/api.html b/client/views/static/api.html
index 5911791..2c8f25a 100644
--- a/client/views/static/api.html
+++ b/client/views/static/api.html
@@ -1,7 +1,4 @@
-
- API Access
-
@@ -13,16 +10,12 @@
-
Student Government provides a read-only JSON REST API for retreiving SG Petition information.
+
This service provides a read-only JSON REST API for retreiving petition information.
-
Developers utilizing the API should keep the stability of the API's infrastructure and their own applications in mind. We may impose usage limits at any time or degrade performance for developers who create an unreasonable number of requests.
+
Developers utilizing the API should keep the stability of the API's infrastructure and their own applications in mind. This API is not intended for production use.
-
Availability: While we strive to maintain a highly available API, there may be times where it is unavailable for unanticipated causes. We encourage developers to write code that can handle these situations.
-
-
Unpublished Petitions: At any time, administrators may choose to unpublish a petition (a decision that can be later reversed). Unpublished petitions are not visible publicly on the site, nor are they available via the API.
-
Developers: Claim an API Key by going to your profile
@@ -57,7 +50,7 @@
Summary
Includes the petition's name, submission time, title, description, minimum signature threshold, and signature count. The petition's response and responded at time are also included, if a response has been made. There is a limit of 500 petitions.
-
+
Path Parameters
@@ -114,8 +107,8 @@ Summary
-
Provides identical information as the Petition List, but also includes the initials of petition signers and up to a 7-day historical reading of the petition count (smaller for petitions less than one week in age).
-
+
Provides identical information as the Petition List, but also includes the initials of petition signatories and up to a 7-day historical reading of the petition count (smaller for petitions less than one week in age).
+
Path Parameters
@@ -146,4 +139,4 @@ Example Response Object
-
\ No newline at end of file
+
diff --git a/client/views/static/api.js b/client/views/static/api.js
index 6ca8021..d48969c 100644
--- a/client/views/static/api.js
+++ b/client/views/static/api.js
@@ -25,7 +25,7 @@ Template.api.helpers({
return JSON.stringify(response, undefined, 2);
},
example_individual: function makeExamplePetition () {
- var response = {
+ var response = {
author: "Pete Mikitsh",
submitted: 1410112945911,
title: "Extend hours for RIT Computer Labs at peak times.",
@@ -33,24 +33,24 @@ Template.api.helpers({
votes: 4,
_id: "bDA8ynBMErm9NLaqj",
minimumVotes: 25,
- signers:[
+ signatories:[
"PAM",
"ALC",
"TSP",
"NXC"
],
- history:[
- {
+ history:[
+ {
created_at: 1410112945912,
votes: 1,
_id: "ibdMPcGaS5gGmBEha"
},
- {
+ {
created_at: 1410199345913,
votes: 2,
_id: "5bw2TeyDK48XcqSiw"
},
- {
+ {
created_at: 1410285745914,
votes: 4,
_id: "jZu2D26gwRcZExFy2"
@@ -59,4 +59,4 @@ Template.api.helpers({
};
return JSON.stringify(response, undefined, 2);
}
-});
\ No newline at end of file
+});
diff --git a/client/views/static/moderation.html b/client/views/static/moderation.html
index c66d567..58bbbbd 100644
--- a/client/views/static/moderation.html
+++ b/client/views/static/moderation.html
@@ -1,17 +1,9 @@
-
- Moderation Policy
-
- "Since free and civil discourse is at the heart of a university community, users should communicate in a manner that advances the cause of learning and mutual understanding."
- RIT Code of Conduct for Computer and Network Use
-
-
Use of this site falls under the RIT Code of Conduct for Computer and Network Use .
-
Student Government reserves the right to edit or remove any petition at any time for violating the Code of Conduct. This includes, but is not limited to, creating an intimidating, hostile or abusive environment for any member of the RIT community, or posting of any obscene, defamatory, threatening, or otherwise harassing petitions.
-
When using this service, you agree to sign petitions from only one RIT Computer Account. Should you have access to more than one account, you will only sign from your primary student, faculty, or staff account.
-
Please exercise good judgment when using this service.
+
PawPrints supports moderation! Administrators may remove petitions at their discretion. Optionally, the application may be configured to put petitions into a moderation queue before they are made public.
+
Admins: Use this space to describe your moderation policy. Short and sweet is ideal!
-
\ No newline at end of file
+
diff --git a/client/views/static/petition_process.html b/client/views/static/petition_process.html
index 246af48..df0c27f 100644
--- a/client/views/static/petition_process.html
+++ b/client/views/static/petition_process.html
@@ -1,7 +1,4 @@
-
- The Petition Process
-
@@ -10,7 +7,7 @@
Search for petitions and if a petition similar to yours already exists, sign that petition.
-
This will help raise support for issue and help you better reach the minimum threshold of {{singleton.minimumThreshold}} signatures (as of {{ threshold_last_updated }}) for receiving an official Student Government response.
+
This will help raise support for issue and help you better reach the minimum threshold of {{singleton.minimumThreshold}} signatures (as of {{ threshold_last_updated }}) for receiving an official response.
@@ -36,7 +33,7 @@
Use social media to spread awareness of your issue.
-
A petition has one month to reach its threshold. If the threshold is not reached, then the petition is archived and available via the search. Student Government may elect to respond to a petition prior to reaching its threshold.
+
Make sure you get enough signatures before the petition expires!
Submit a petition.
diff --git a/client/views/static/petition_process.js b/client/views/static/petition_process.js
index 8f22169..6bd48af 100644
--- a/client/views/static/petition_process.js
+++ b/client/views/static/petition_process.js
@@ -2,4 +2,4 @@ Template.petitionProcess.helpers({
threshold_last_updated: function thresholdLastUpdatedAt () {
return new moment(Singleton.findOne().threshold_updated_at).format("L");
}
-});
\ No newline at end of file
+});
diff --git a/client/views/updates/create_update.html b/client/views/updates/create_update.html
index f44eed3..c9e6b96 100644
--- a/client/views/updates/create_update.html
+++ b/client/views/updates/create_update.html
@@ -27,14 +27,7 @@
{{fromNow null}} BY {{upcase user.profile.name}}
{{/if}}
-
+
-
- {{this.title}}
-
- {{fromNow this.created_at}} BY {{upcase this.author}}
+ {{this.title}}
+ {{#if showAuthor}}Update by {{this.author}} - {{/if}}{{fromNow this.created_at}}
+ {{{breaklines this.description }}}
-
\ No newline at end of file
+
diff --git a/client/views/updates/update_blurb.js b/client/views/updates/update_blurb.js
new file mode 100644
index 0000000..fc7ecff
--- /dev/null
+++ b/client/views/updates/update_blurb.js
@@ -0,0 +1,8 @@
+Template.updateBlurb.helpers({
+ 'showAuthor': function () {
+ return Singleton.findOne().updateAuthorDisplay;
+ },
+ 'submitted_date':function(){
+ return new moment(this.created_at).format('MMMM Do YYYY, h:mm a');
+ }
+});
diff --git a/client/views/users/user_edit.html b/client/views/users/user_edit.html
index a498d1c..8daad99 100644
--- a/client/views/users/user_edit.html
+++ b/client/views/users/user_edit.html
@@ -17,9 +17,27 @@ Profile About Me
-
Username: {{ user.username }}
-
Name: {{ user.profile.name }}
-
Initials: {{ user.profile.initials }}
+
@@ -30,13 +48,13 @@ Profile Notification Settings