Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change all instances of 'story' to 'page' #2518

Merged
merged 12 commits into from Oct 9, 2016

Conversation

@christianp
Copy link
Contributor

christianp commented Oct 2, 2016

This commit replaces all instances of 'story' or 'stories' with 'page' or 'pages'.

The settings STORY_INDEX and COMMENTS_IN_STORIES are now PAGE_INDEX and COMMENTS_IN_PAGES

see #1891

This commit replaces all instances of 'story' or 'stories' with 'page' or 'pages'.

The settings STORY_INDEX and COMMENTS_IN_STORIES are now PAGE_INDEX and COMMENTS_IN_PAGES

see #1891
@@ -88,14 +88,14 @@ one of the existing ones.
You can do doctests, you can do unit tests, you can do integration tests. There is support
for all of them.

Posts and Stories
Posts and Pages
-----------------

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Oct 2, 2016

Member

Underline needs to match new title length.


You can create the page's files manually or use the ``new_post`` command
with the ``-p`` option, which will place the files in the folder that
has ``use_in_feed`` set to False.

In some places (including default directories and templates), pages are called

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Oct 2, 2016

Member

I’d prefer this explainer to be left in.

@@ -1 +1,185 @@
../creating-a-site.txt

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Oct 2, 2016

Member

Your git client seems to have broken symlinks.

This comment has been minimized.

Copy link
@christianp

christianp Oct 3, 2016

Author Contributor

I'm on Windows. How do I fix that?

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Oct 3, 2016

Member

You can’t; we will if we go ahead with this.

@@ -378,7 +378,7 @@ class Importer(Command):
process_data can branch into:
import_story (may use import_file and save_post)

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Oct 3, 2016

Member

Let’s not break an internal API here and undo this one.

@Kwpolska
Copy link
Member

Kwpolska commented Oct 3, 2016

To do (by us):

  • fix baseline
  • fix symlinks
  • offer settings migrations

@ralsina, mind reviewing this, too?

@Kwpolska Kwpolska self-assigned this Oct 8, 2016
Kwpolska added 7 commits Oct 8, 2016
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Copy link
Member

Kwpolska commented Oct 8, 2016

@christianp Alright, I had some time to fix stuff and this now looks better. Please add an entry to CHANGES.txt and your name to AUTHORS.txt. You might also want to see how it looks now. Thanks for contributing to Nikola — we hope you’ll stay with us for longer!

I left story.tmpl as-is because this would break too much stuff. Perhaps in v8?

@ralsina (and anyone else): Reviews welcome.

@ralsina
Copy link
Member

ralsina commented Oct 9, 2016

@Kwpolska sorry, I have absolutely no Nikola time for personal reasons until next week at least. Anything has my +1 I'd rather have master break a bit than letting contributions wither.

@Kwpolska
Copy link
Member

Kwpolska commented Oct 9, 2016

@ralsina Okay, I’ll merge this now, but please look through the files changed whenever you have a while (no rush).

@Kwpolska Kwpolska merged commit 398a724 into getnikola:master Oct 9, 2016
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.