Commit graph

1,044 commits

Author SHA1 Message Date
Alexis Metaireau
4ce5adb2a0 Merge branch 'master' of github.com:ametaireau/pelican into fix-functional-tests 2012-07-10 13:51:34 +02:00
Alexis Metaireau
d726e5e81c Merge pull request #404 from tbunnyman/PerPageTemplates#376
Add per page/article templates. Closes #376
2012-07-10 04:51:17 -07:00
Alexis Metaireau
4d23ffc112 Updated the functional tests to match latest changes. 2012-07-10 13:42:43 +02:00
tBunnyMan
dff5b3589b Add per page templates. Closes #376
Also set up helper classes in test_generators.py for cleaner tests
2012-07-07 14:15:43 -07:00
Justin Mayer
dc21efbe10 Improved quickstart config formatting. Fixes #401. 2012-07-07 10:33:47 -07:00
justinmayer
4c060030ae Merge pull request #403 from justinmayer/quickstart
Add dual dev/publish modes to quickstart script
2012-07-07 09:10:19 -07:00
Justin Mayer
18b4d65c4e Clarify quickstart docs and remove spurious line 2012-07-07 08:45:50 -07:00
Justin Mayer
764a2cfa51 Add dual dev/publish modes to quickstart script
Certain configuration options are more useful in production than they
are in development. Some examples might be absolute URLs, external
analytics service identifiers, Disqus comments, etc. This version of the
quickstart script creates two configuration files: one for development
and the other for use when publishing. In addition, the related docs
have been expanded considerably. Last but not least, the quickstart
script will now detect whether there is a project folder associated with
the currently active virtualenv (if any) and use it by default.
2012-07-07 07:41:12 -07:00
Justin Mayer
d8b85580dc Minor syntactical improvements to quickstart 2012-07-05 12:15:55 -07:00
Justin Mayer
72421d4438 Support arbitrary SSH ports in pelican-quickstart
Some folks choose non-standard SSH ports for security reasons, so it
makes sense to try to support that in the pelican-quickstart script.
2012-07-05 11:34:45 -07:00
Alexis Metaireau
6521af5a13 Merge pull request #394 from tbunnyman/issue#380
Small fix for nose tests
2012-07-05 02:19:51 -07:00
tBunnyMan
886a1d94b9 Changed name of the page helper method to prevent nose from running it as a test 2012-07-04 17:09:42 -07:00
Bruno Binet
2b47429c4a update generated output for 'custom' functional test
LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py samples/content/
2012-07-05 01:52:17 +02:00
Bruno Binet
fe9388a7a4 Merge remote-tracking branch 'origin/master' into fix-functional-tests
Conflicts:
	tests/support.py
2012-07-05 01:22:31 +02:00
Alexis Metaireau
236dbb2842 Merge pull request #393 from tbunnyman/DeleteContentsNotDirectory
Change behavior of DELETE_OUTPUT_DIRECTORY to purge contents of the directory…
2012-07-04 15:24:43 -07:00
tBunnyMan
4427424db3 Changed debugging reporting to post file deletion instead of pre file deletion per request. 2012-07-04 15:20:15 -07:00
tBunnyMan
cb3c40256a Merge branch 'master' of github.com:ametaireau/pelican into DeleteContentsNotDirectory 2012-07-04 15:12:39 -07:00
Bruno Binet
7abb2a7a7c temporary skip failing test_basic_generation_works functional test 2012-07-05 00:12:10 +02:00
Bruno Binet
3a2df479da fix test_custom_generation_works functional test 2012-07-05 00:12:05 +02:00
Bruno Binet
775b236c93 update doc for replacing FALLBACK_ON_FS_DATE by DEFAULT_DATE 2012-07-05 00:12:05 +02:00
Bruno Binet
36be150f20 replace FALLBACK_ON_FS_DATE by DEFAULT_DATE
DEFAULT_DATE allows to specify any default date as a tuple in addition to the
fallback on filesystem mtime check
2012-07-05 00:12:05 +02:00
Bruno Binet
b44ea53741 update command to generate functional tests output
we need to force LC_ALL="C" to avoid generating articles/pages in other
languages
2012-07-05 00:11:57 +02:00
tBunnyMan
c07821e8a2 Too many empty lines at end of file 2012-07-04 14:56:52 -07:00
tBunnyMan
2b062ce384 Documentation typo 2012-07-04 14:55:39 -07:00
Alexis Metaireau
ea0a964365 Merge pull request #389 from tbunnyman/issue#380
Add support for `status: hidden` in pages
2012-07-04 14:51:50 -07:00
tBunnyMan
d589450200 Change behavior of DELETE_OUTPUT_DIRECTORY to purge contents of the directory, not the directory itself.
Added Debug level logging for each deletion
Added error level logging when a delete has an exception
Built a test case for clean_output_directory in tests.utils.py
Updated `settings` in documentation to reflect new behavior
Removed the tip from the bottom of getting started since this setting should no longer break web servers pointing to the output directory.
2012-07-04 12:32:20 -07:00
tBunnyMan
cf696939f8 Added tests for page generation.
Currently tests rst & markdown generation, ignoring pages w/ bad status, and status hidden vs published
2012-07-04 10:06:53 -07:00
Alexis Metaireau
76f86fb3ca Merge pull request #391 from MaNDRaXe/master
Fixing a typo in pelican/__init__.py on logger call for debug
2012-07-03 06:59:15 -07:00
Alexandre RODIERE
8a53ee1ad3 Fix typo on debug logger calls. 2012-07-03 15:19:38 +02:00
justinmayer
dff20f250b Merge pull request #388 from sigmavirus24/master
Add -U (--upgrade) to upgrade a theme with pelican-theme
2012-07-01 11:02:41 -07:00
Justin Mayer
9ad93d36a0 Convert code in docs to inline literals
Most of the references to code and settings in the docs were wrapped
in single tickmarks (`), while reStructuredText syntax actually calls
for double tickmarks for inline literals, which are normally rendered
as monospaced text with spaces preserved. Converted the relevant
instances to inline literals, along with some other minor fixes.
2012-07-01 10:52:39 -07:00
tBunnyMan
c2993c4d4e Documentation typo 2012-06-27 07:02:25 -07:00
tBunnyMan
de251bc999 Fixes typo in error message for bad status
Bugfix #380 We want the bad status of page, not article.
2012-06-26 19:51:48 -07:00
tBunnyMan
a0e46c9106 Add support for status: hidden in pages
Resolves #380 If the status metadata is set to 'hidden' on a page it is translated and rendered but not linked anywhere in the site.
2012-06-26 19:26:43 -07:00
Alexis Metaireau
b2ff07d58c we need jinja >= 2.4 2012-06-26 16:28:00 +02:00
Ian Cordasco
707536725d Failed to commit some important changes. 2012-06-25 11:43:12 -04:00
Ian Cordasco
387e5c1ab9 Add upgrade ability to pelican-themes. Fix typos.
I disliked having to do:

$ pelican-theme -r <theme-name> -i <theme-path>

So I modified install() to handle an upgrade of an existing theme. While doing
so, I noticed that in install() and symlink() the script would error with 'no a
directory' instead of 'not a directory'. So I fixed that for you as well.
2012-06-25 08:57:09 -04:00
justinmayer
e89b32511d Merge pull request #374 from maru-sama/master
Small fix for the notmyidea template
2012-06-16 11:55:32 -07:00
Justin Mayer
083f302b19 Remove errant .DS_Store and add to .gitignore 2012-06-16 11:23:55 -07:00
Michael Guntsche
c461c6435d Fix HTML5 conformance of the notmyidea template
The W3C validator complained that the pagination <p> was inside an <ol>.
So just move it out of there.
2012-06-16 19:53:53 +02:00
Alexis Metaireau
f7fcbe7dc9 Merge pull request #373 from asselinpaul/master
Added GoSquared support
2012-06-15 15:31:24 -07:00
Alexis Metaireau
f822e83489 Merge pull request #372 from sigmavirus24/master
Gitorious icon added to default theme
2012-06-15 15:30:53 -07:00
Alexis Metaireau
d3ada540bf Merge pull request #369 from mankyd/summary_len
Max Summary Length
2012-06-15 15:29:04 -07:00
asselinpaul
d1dfcdafc2 updated
remove GoSqaured from README and template file from the notmyidea theme.
2012-06-14 23:32:23 +02:00
asselinpaul
44cadf7c1f added GoSquared support
GoSquared(analytics) support added in default themes and documentation
(in French and English)
2012-06-14 23:04:23 +02:00
Ian Cordasco
ddb345897e Add gitorious icon to default theme.
See ametaireau/pelican-themes#38 and ametaireau/pelican-themes#39 for
references.
2012-06-14 10:29:44 -04:00
Alexis Metaireau
70fd137ced Merge pull request #371 from maru-sama/master
Add Template files to MANIFEST.in
2012-06-13 14:30:46 -07:00
Michael Guntsche
8c375f016f Add template files to MANIFEST.in
Commit 7c53cc8955 put the templates in a separate directory.
As a result setuptools did not include them any longer.
2012-06-13 21:54:40 +02:00
Justin Mayer
336d6fd407 Getting Started documentation improvements
Expanded installation instructions, added Upgrading section, updated
link to Pip installer, and other minor improvements.
2012-06-11 12:27:01 -07:00
dave mankoff
1d5228388b git pull git://github.com/ametaireau/pelican.git 2012-06-11 10:21:13 -04:00