diff --git a/app.js b/app.js
index 3fee6d2d53..0207f8e8d1 100755
--- a/app.js
+++ b/app.js
@@ -311,7 +311,7 @@ app.get('/nodeschool-challenges', function(req, res) {
app.get('/news', function(req, res) {
- res.redirect(301, '/stories/hot');
+ res.redirect(301, '/stories/');
});
app.get('/learn-to-code', challengeMapController.challengeMap);
app.get('/about', function(req, res) {
@@ -435,13 +435,6 @@ app.get(
storyController.recentJSON
);
-app.get(
- '/stories/',
- function(req, res) {
- res.redirect(302, '/stories/hot');
- }
-);
-
app.get(
'/stories/comments/:id',
storyController.comments
@@ -483,21 +476,10 @@ app.post(
);
app.get(
- '/stories/hot',
+ '/stories/',
storyController.hot
);
-app.get(
- '/stories/recent',
- storyController.recent
-);
-
-
-app.get(
- '/stories/search',
- storyController.search
-);
-
app.post(
'/stories/search',
storyController.getStories
diff --git a/controllers/resources.js b/controllers/resources.js
index dada649cbf..f2d9940a9e 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -407,7 +407,7 @@ module.exports = {
var urlImage = metaImage.attr('content') ? metaImage.attr('content') : '';
var metaTitle = $('title');
var description = metaDescription.attr('content') ? metaDescription.attr('content') : '';
- result.title = metaTitle.text().length < 141 ? metaTitle.text() : metaTitle.text().slice(0, 137) + " ...";
+ result.title = metaTitle.text().length < 90 ? metaTitle.text() : metaTitle.text().slice(0, 87) + "...";
result.image = urlImage;
result.description = description;
callback(null, result);
diff --git a/public/css/main.less b/public/css/main.less
index 47037ca344..2972861af8 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -930,11 +930,17 @@ iframe.iphone {
.story-headline {
font-size: 20px;
- @media (max-width: 767px) {
- text-align: center;
- margin-top: 10px;
- margin-bottom: 10px;
- }
+ margin-left: 14px;
+ margin-top: -5px;
+}
+
+.story-byline {
+ margin-top: 5px;
+ font-size: 14px;
+}
+
+.media-stories {
+ margin-left: 20px;
}
#reply-to-main-post, #upvote {
@@ -979,7 +985,7 @@ iframe.iphone {
border-radius: 5px;
width: 100%;
@media (max-width: 768px) {
- margin-top: 5px;
+ margin-right: 5px;
}
}
diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json
index 677b63b903..d573ea45a3 100644
--- a/seed_data/field-guides.json
+++ b/seed_data/field-guides.json
@@ -308,7 +308,7 @@
"
You'll continue to work on nonprofit projects until you've built a sufficiently impressive portfolio and references to start your job search. Your portfolio will ultimately have three to five nonprofit projects. We estimate that the 900 hours of nonprofit projects you're going to complete, in addition to the 100 hours of challenges you've already completed, will be enough to qualify you for your first coding job. This will produce a much broader portfolio than a traditional coding bootcamp, which generally only has one or two capstone projects.
",
"Choosing your first Nonprofit Project
",
"We've categorized all the nonprofit projects by estimated time investment per camper: 100 hours, 200 hours, and 300 hours. These are only rough estimates.
",
- "Example: if you and the camper you're paired up with (your pair) each stated you could work 20 hours per week (on the form you filled out). If the project is a 100 hour per camper project, you should be able to complete it in about 5 weeks.
",
+ "Example: if you and the camper you're paired up with (your pair) each stated you could work 20 hours per week. If the project is a 100 hour per camper project, you should be able to complete it in about 5 weeks.
",
"Our team of nonprofit project camp counselors will match you and your pair based on:",
"
",
" - Your estimated time commitment (10, 20 or 40 hours per week)
",
diff --git a/views/field-guide/show.jade b/views/field-guide/show.jade
index d62cf4ddbc..561a09d465 100644
--- a/views/field-guide/show.jade
+++ b/views/field-guide/show.jade
@@ -20,19 +20,19 @@ block content
.ten-pixel-break
a.btn.btn-big.signup-btn.btn-block(href="/login") Start learning to code (it's free)
.spacer
-#show-all-dialog.modal(tabindex='-1')
- .modal-dialog.animated.fadeInUp.fast-animation
- .modal-content
- .modal-header.all-list-header Field Guide Articles
- a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
- .modal-body
- include ../partials/field-guide
-#fieldGuideId.hidden= fieldGuideId
-script.
- $(document).ready(function() {
- $('body').keydown(function(e) {
- if (e.ctrlKey && e.keyCode == 13) {
- $('.next-field-guide-button').click();
- }
+ #show-all-dialog.modal(tabindex='-1')
+ .modal-dialog.animated.fadeInUp.fast-animation
+ .modal-content
+ .modal-header.all-list-header Field Guide Articles
+ a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
+ .modal-body
+ include ../partials/field-guide
+ #fieldGuideId.hidden= fieldGuideId
+ script.
+ $(document).ready(function() {
+ $('body').keydown(function(e) {
+ if (e.ctrlKey && e.keyCode == 13) {
+ $('.next-field-guide-button').click();
+ }
+ });
});
- });
diff --git a/views/nonprofits/show.jade b/views/nonprofits/show.jade
index 90027eb82d..87d070239d 100644
--- a/views/nonprofits/show.jade
+++ b/views/nonprofits/show.jade
@@ -61,12 +61,12 @@ block content
.text-center
a.btn.btn-primary.btn-big.btn-block.disabled(href='/nonprofits/interested-in-nonprofit/#{dashedName}') I'm interested in building this project *
p * Complete all our Bonfires, Ziplines, and Basejumps to unlock this.
- #showAllButton.btn.btn-info.btn-big.btn-block Show all Nonprofits Projects
+ #showAllButton.btn.btn-info.btn-big.btn-block Show all Nonprofit Projects
if (buttonActive)
.col-xs-12.col-sm-8.col-sm-offset-2
.text-center
a.btn.btn-primary.btn-big.btn-block(href='/nonprofits/interested-in-nonprofit/#{dashedName}') I'm interested in building this project
- #showAllButton.btn.btn-info.btn-big.btn-block Show all Nonprofits Projects
+ #showAllButton.btn.btn-info.btn-big.btn-block Show all Nonprofit Projects
.row
.col-xs-12.text-center
if !user
diff --git a/views/stories/hot-stories.jade b/views/stories/hot-stories.jade
index 0dda80688f..fcf297cd49 100644
--- a/views/stories/hot-stories.jade
+++ b/views/stories/hot-stories.jade
@@ -21,46 +21,45 @@
$(div)
.html(
- "" +
- "
" +
- (i + 1) +
- "
" +
- "
" +
+ "
" +
+ "
" +
- "
" +
- "
" +
- "
" +
- "" +
+ "
" +
+ "
" +
+ rank + (rank > 1 ? " points" : " point") + " · posted " +
+ moment(data[i].timePosted).fromNow() +
+ " by
@" + data[i].author.username + " " +
+ "
" +
+ "
" +
"
" +
- "
" +
- "
" +
- "
" +
- "
" +
- "" +
+ "
" +
+ "
"
);
diff --git a/views/stories/news-nav.jade b/views/stories/news-nav.jade
index 0a8f2178d0..2847dc6aeb 100644
--- a/views/stories/news-nav.jade
+++ b/views/stories/news-nav.jade
@@ -1,5 +1,5 @@
a.btn.btn-primary.btn-big.btn-block(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit a link
-a.btn.btn-success.btn-big.btn-block(href='/stories/hot' class="#{ (page === 'show' || page === 'submit' || page === 'storySubmission') ? '' : 'hidden' }") Show all Links
+a.btn.btn-success.btn-big.btn-block(href='/stories/' class="#{ (page === 'show' || page === 'submit' || page === 'storySubmission') ? '' : 'hidden' }") Show all Links
.spacer
.input-group(class="#{ page === 'hot' ? '' : 'hidden' }")
input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links', autofocus)
diff --git a/views/stories/preliminary-submit.jade b/views/stories/preliminary-submit.jade
index 4bc8ba873c..55d7f705b2 100644
--- a/views/stories/preliminary-submit.jade
+++ b/views/stories/preliminary-submit.jade
@@ -3,7 +3,7 @@
div(ng-controller="URLSubmitController")
form.input-group(name='URLSubmit')
- input#story-url.big-text-field.field-responsive.form-control(placeholder='Paste your link here', name='link', type='url', ng-model='possibleURL' autofocus)
+ input#story-url.big-text-field.field-responsive.form-control(placeholder='Paste your link here', name='link', type='url', ng-model='possibleURL', required='required', autofocus)
span.input-group-btn
button#preliminary-story-submit.btn.btn-big.btn-primary.btn-responsive(type='button', ng-disabled='URLSubmit.link.$invalid') Submit
div(ng-show="URLSubmit.link.$error.url && !URLsubmit.link.$pristine")
@@ -52,4 +52,4 @@
return this.id;
})
.get()
- .join('&');
\ No newline at end of file
+ .join('&');
diff --git a/views/stories/submit-story.jade b/views/stories/submit-story.jade
index 5eada44e57..dbe42dd1e7 100644
--- a/views/stories/submit-story.jade
+++ b/views/stories/submit-story.jade
@@ -16,12 +16,12 @@
.col-xs-12.col-md-1
label.control-label.control-label-story-submission(for='name') Title
.col-xs-12.col-md-11
- input#story-title.form-control(placeholder='Type a headline for your link here', name='Title', maxlength='90' autofocus)
- // input#story-title.form-control(placeholder='Type a headline for your link here', name='Title', maxlength='90' ng-model='submitStory.title.Title',required='required', autocomplete="off" autofocus)
- //.col-xs-12.col-md-11.col-md-offset-1(ng-cloak, ng-show="submitStory.title.$error.required")
- // alert(type='danger')
- // span.ion-close-circled
- // | A headline is required to submit.
+
+ input#story-title.form-control(placeholder='Type a headline for your link here', name='Title', maxlength='90' ng-model='submitStory.title',required='required', autocomplete="off", ng-init='submitStory.title="#{storyTitle}"' autofocus)
+ .col-xs-12.col-md-11.col-md-offset-1(ng-cloak, ng-show="submitStory.title.$error.required")
+ alert(type='danger')
+ span.ion-close-circled
+ | A headline is required to submit.
.form-group
.col-xs-12.col-md-1
label.control-label.control-label-story-submission(for='name') Comment
@@ -43,7 +43,7 @@
.row
.form-group
- button.btn.btn-big.btn-block.btn-primary#story-submit(type='submit', ng-disabled='submitStory.$invalid') Submit
+ button.btn.btn-big.btn-block.btn-primary#story-submit(type='submit', ng-disabled='submitStory.$invalid || !submitStory') Submit
script.
$('#story-url').val(storyURL).attr('disabled', 'disabled');
$('#story-title').val(storyTitle);