Merge lp:~guy.kloss/sloecode/guy_dev into lp:sloecode
- guy_dev
- Merge into trunk
Proposed by
Guy K. Kloss
Status: | Merged |
---|---|
Approved by: | Thomi Richards |
Approved revision: | 104 |
Merged at revision: | 104 |
Proposed branch: | lp:~guy.kloss/sloecode/guy_dev |
Merge into: | lp:sloecode |
Diff against target: |
708 lines (+560/-7) 17 files modified
HISTORY (+3/-0) INSTALL (+62/-0) MANIFEST.in (+16/-0) VERSION (+1/-0) docs/Makefile (+95/-0) docs/make.bat (+114/-0) docs/source/conf.py (+198/-0) docs/source/history.rst (+1/-0) docs/source/index.rst (+23/-0) docs/source/installation.rst (+1/-0) docs/source/overview.rst (+5/-0) setup.cfg (+8/-0) setup.py (+21/-2) sloecode/templates/admin/person-list.html (+4/-1) sloecode/templates/index.html (+1/-1) sloecode/templates/login.html (+3/-2) sloecode/templates/project-details.html (+4/-1) |
To merge this branch: | bzr merge lp:~guy.kloss/sloecode/guy_dev |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thomi Richards | Pending | ||
Review via email:
|
Commit message
Description of the change
* Added Sphinx documentation skeleton
* Updated some html templates to make them root path prefix aware in URLs
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'HISTORY' |
2 | --- HISTORY 1970-01-01 00:00:00 +0000 |
3 | +++ HISTORY 2011-06-03 03:32:24 +0000 |
4 | @@ -0,0 +1,3 @@ |
5 | +History |
6 | +======= |
7 | + |
8 | |
9 | === added file 'INSTALL' |
10 | --- INSTALL 1970-01-01 00:00:00 +0000 |
11 | +++ INSTALL 2011-06-03 03:32:24 +0000 |
12 | @@ -0,0 +1,62 @@ |
13 | +============ |
14 | +Installation |
15 | +============ |
16 | + |
17 | +Sloecode uses distribute for installation therefore it may be installed |
18 | +using: |
19 | + |
20 | +* from source on the command-line or |
21 | +* from pypi using pip or easy_install. |
22 | + |
23 | +From source |
24 | +----------- |
25 | + |
26 | +1) Download the source distribution of Sloecode. |
27 | +2) Unzip the distribution into a directory. |
28 | +3) cd into that directory and type the following command (assuming python |
29 | + is in your path (on Linux systems root access may be required) |
30 | + |
31 | + .. code-block:: sh |
32 | + |
33 | + > python setup.py install |
34 | + |
35 | +4) Sloecode should now be available inside you system python as |
36 | + |
37 | + .. code-block:: py |
38 | + |
39 | + >>> import sloecode |
40 | + |
41 | +From pypi |
42 | +--------- |
43 | + |
44 | +1) type the following command (assuming pip |
45 | + is in your path (on Linux systems root access may be required) |
46 | + |
47 | + .. code-block:: sh |
48 | + |
49 | + > pip install Sloecode |
50 | + |
51 | +4) Sloecode should now be available inside you system python as |
52 | + |
53 | + .. code-block:: py |
54 | + |
55 | + >>> import sloecode |
56 | + |
57 | + |
58 | +Documentation |
59 | +------------- |
60 | + |
61 | +Sloecode uses sphinx for its documentation. Please install spinx either |
62 | +via pip or easy_install or from your package mangement system. |
63 | + |
64 | +To use sphinx to build the documentation |
65 | +from source use the following command from the root directory of the project |
66 | + |
67 | +.. code-block:: sh |
68 | + |
69 | + > python setup.py build_sphinx |
70 | + |
71 | +The resulting html files will be in docs/build/html |
72 | + |
73 | + |
74 | + |
75 | |
76 | === modified file 'MANIFEST.in' |
77 | --- MANIFEST.in 2010-12-14 20:52:13 +0000 |
78 | +++ MANIFEST.in 2011-06-03 03:32:24 +0000 |
79 | @@ -1,3 +1,19 @@ |
80 | +include MANIFEST.in |
81 | +include README |
82 | +include HISTORY |
83 | +include HACKING |
84 | +include TODO |
85 | +include VERSION |
86 | +include LICENSE |
87 | +include setup.py |
88 | +include ez_setup.py |
89 | +include development.ini |
90 | +include test.ini |
91 | +include Makefile |
92 | +include make_help.py |
93 | +recursive-include sloecode.egg-info * |
94 | include sloecode/config/deployment.ini_tmpl |
95 | recursive-include sloecode/public * |
96 | recursive-include sloecode/templates * |
97 | +recursive-include docs/source * |
98 | +include docs/build/empty_file |
99 | |
100 | === added file 'VERSION' |
101 | --- VERSION 1970-01-01 00:00:00 +0000 |
102 | +++ VERSION 2011-06-03 03:32:24 +0000 |
103 | @@ -0,0 +1,1 @@ |
104 | +0.1 |
105 | \ No newline at end of file |
106 | |
107 | === added directory 'docs' |
108 | === added file 'docs/Makefile' |
109 | --- docs/Makefile 1970-01-01 00:00:00 +0000 |
110 | +++ docs/Makefile 2011-06-03 03:32:24 +0000 |
111 | @@ -0,0 +1,95 @@ |
112 | +# Makefile for Sphinx documentation |
113 | +# |
114 | + |
115 | +# You can set these variables from the command line. |
116 | +SPHINXOPTS = |
117 | +SPHINXBUILD = sphinx-build |
118 | +PAPER = |
119 | +SOURCEDIR = source |
120 | +BUILDDIR = build |
121 | + |
122 | +# Internal variables. |
123 | +PAPEROPT_a4 = -D latex_paper_size=a4 |
124 | +PAPEROPT_letter = -D latex_paper_size=letter |
125 | +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR) |
126 | + |
127 | +.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest |
128 | + |
129 | +help: |
130 | + @echo "Please use \`make <target>' where <target> is one of" |
131 | + @echo " html to make standalone HTML files" |
132 | + @echo " dirhtml to make HTML files named index.html in directories" |
133 | + @echo " pickle to make pickle files" |
134 | + @echo " json to make JSON files" |
135 | + @echo " htmlhelp to make HTML files and a HTML help project" |
136 | + @echo " qthelp to make HTML files and a qthelp project" |
137 | + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" |
138 | + @echo " changes to make an overview of all changed/added/deprecated items" |
139 | + @echo " linkcheck to check all external links for integrity" |
140 | + @echo " doctest to run all doctests embedded in the documentation (if enabled)" |
141 | + |
142 | +clean: |
143 | + -rm -rf $(BUILDDIR)/* |
144 | + |
145 | +html: |
146 | + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html |
147 | + @echo |
148 | + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." |
149 | + |
150 | +dirhtml: |
151 | + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml |
152 | + @echo |
153 | + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." |
154 | + |
155 | +pickle: |
156 | + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle |
157 | + @echo |
158 | + @echo "Build finished; now you can process the pickle files." |
159 | + |
160 | +json: |
161 | + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json |
162 | + @echo |
163 | + @echo "Build finished; now you can process the JSON files." |
164 | + |
165 | +htmlhelp: |
166 | + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp |
167 | + @echo |
168 | + @echo "Build finished; now you can run HTML Help Workshop with the" \ |
169 | + ".hhp project file in $(BUILDDIR)/htmlhelp." |
170 | + |
171 | +qthelp: |
172 | + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp |
173 | + @echo |
174 | + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ |
175 | + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" |
176 | + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Sloecode.qhcp" |
177 | + @echo "To view the help file:" |
178 | + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Sloecode.qhc" |
179 | + |
180 | +latex: |
181 | + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex |
182 | + @echo |
183 | + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." |
184 | + @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ |
185 | + "run these through (pdf)latex." |
186 | + |
187 | +epub: |
188 | + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub |
189 | + @echo |
190 | + @echo "Build finished; the epub files are in $(BUILDDIR)/epub." |
191 | + |
192 | +changes: |
193 | + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes |
194 | + @echo |
195 | + @echo "The overview file is in $(BUILDDIR)/changes." |
196 | + |
197 | +linkcheck: |
198 | + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck |
199 | + @echo |
200 | + @echo "Link check complete; look for any errors in the above output " \ |
201 | + "or in $(BUILDDIR)/linkcheck/output.txt." |
202 | + |
203 | +doctest: |
204 | + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest |
205 | + @echo "Testing of doctests in the sources finished, look at the " \ |
206 | + "results in $(BUILDDIR)/doctest/output.txt." |
207 | |
208 | === added directory 'docs/build' |
209 | === added file 'docs/build/empty_file' |
210 | === added file 'docs/make.bat' |
211 | --- docs/make.bat 1970-01-01 00:00:00 +0000 |
212 | +++ docs/make.bat 2011-06-03 03:32:24 +0000 |
213 | @@ -0,0 +1,114 @@ |
214 | +@ECHO OFF |
215 | + |
216 | +REM Command file for Sphinx documentation |
217 | + |
218 | +set SPHINXBUILD=sphinx-build |
219 | +set BUILDDIR=build |
220 | +set SOURCEDIR=source |
221 | +set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% %SOURCEDIR% |
222 | +if NOT "%PAPER%" == "" ( |
223 | + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% |
224 | +) |
225 | + |
226 | +if "%1" == "" goto help |
227 | + |
228 | +if "%1" == "help" ( |
229 | + :help |
230 | + echo.Please use `make ^<target^>` where ^<target^> is one of |
231 | + echo. html to make standalone HTML files |
232 | + echo. dirhtml to make HTML files named index.html in directories |
233 | + echo. pickle to make pickle files |
234 | + echo. json to make JSON files |
235 | + echo. htmlhelp to make HTML files and a HTML help project |
236 | + echo. qthelp to make HTML files and a qthelp project |
237 | + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter |
238 | + echo. changes to make an overview over all changed/added/deprecated items |
239 | + echo. linkcheck to check all external links for integrity |
240 | + echo. doctest to run all doctests embedded in the documentation if enabled |
241 | + goto end |
242 | +) |
243 | + |
244 | +if "%1" == "clean" ( |
245 | + for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i |
246 | + del /q /s %BUILDDIR%\* |
247 | + goto end |
248 | +) |
249 | + |
250 | +if "%1" == "html" ( |
251 | + %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html |
252 | + echo. |
253 | + echo.Build finished. The HTML pages are in %BUILDDIR%/html. |
254 | + goto end |
255 | +) |
256 | + |
257 | +if "%1" == "dirhtml" ( |
258 | + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml |
259 | + echo. |
260 | + echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. |
261 | + goto end |
262 | +) |
263 | + |
264 | +if "%1" == "pickle" ( |
265 | + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle |
266 | + echo. |
267 | + echo.Build finished; now you can process the pickle files. |
268 | + goto end |
269 | +) |
270 | + |
271 | +if "%1" == "json" ( |
272 | + %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json |
273 | + echo. |
274 | + echo.Build finished; now you can process the JSON files. |
275 | + goto end |
276 | +) |
277 | + |
278 | +if "%1" == "htmlhelp" ( |
279 | + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp |
280 | + echo. |
281 | + echo.Build finished; now you can run HTML Help Workshop with the ^ |
282 | +.hhp project file in %BUILDDIR%/htmlhelp. |
283 | + goto end |
284 | +) |
285 | + |
286 | +if "%1" == "qthelp" ( |
287 | + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp |
288 | + echo. |
289 | + echo.Build finished; now you can run "qcollectiongenerator" with the ^ |
290 | +.qhcp project file in %BUILDDIR%/qthelp, like this: |
291 | + echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Sloecode.qhcp |
292 | + echo.To view the help file: |
293 | + echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Sloecode.ghc |
294 | + goto end |
295 | +) |
296 | + |
297 | +if "%1" == "latex" ( |
298 | + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex |
299 | + echo. |
300 | + echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. |
301 | + goto end |
302 | +) |
303 | + |
304 | +if "%1" == "changes" ( |
305 | + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes |
306 | + echo. |
307 | + echo.The overview file is in %BUILDDIR%/changes. |
308 | + goto end |
309 | +) |
310 | + |
311 | +if "%1" == "linkcheck" ( |
312 | + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck |
313 | + echo. |
314 | + echo.Link check complete; look for any errors in the above output ^ |
315 | +or in %BUILDDIR%/linkcheck/output.txt. |
316 | + goto end |
317 | +) |
318 | + |
319 | +if "%1" == "doctest" ( |
320 | + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest |
321 | + echo. |
322 | + echo.Testing of doctests in the sources finished, look at the ^ |
323 | +results in %BUILDDIR%/doctest/output.txt. |
324 | + goto end |
325 | +) |
326 | + |
327 | +:end |
328 | |
329 | === added directory 'docs/source' |
330 | === added directory 'docs/source/_static' |
331 | === added file 'docs/source/conf.py' |
332 | --- docs/source/conf.py 1970-01-01 00:00:00 +0000 |
333 | +++ docs/source/conf.py 2011-06-03 03:32:24 +0000 |
334 | @@ -0,0 +1,198 @@ |
335 | +# -*- coding: utf-8 -*- |
336 | +# |
337 | +# Sloecode documentation build configuration file, created by |
338 | +# sphinx-quickstart on Mon May 10 14:24:02 2010. |
339 | +# |
340 | +# This file is execfile()d with the current directory set to its containing dir. |
341 | +# |
342 | +# Note that not all possible configuration values are present in this |
343 | +# autogenerated file. |
344 | +# |
345 | +# All configuration values have a default; values that are commented out |
346 | +# serve to show the default. |
347 | + |
348 | +import sys, os |
349 | + |
350 | +# If extensions (or modules to document with autodoc) are in another directory, |
351 | +# add these directories to sys.path here. If the directory is relative to the |
352 | +# documentation root, use os.path.abspath to make it absolute, like shown here. |
353 | +#sys.path.append(os.path.abspath('.')) |
354 | + |
355 | +_here = os.path.dirname(__file__) |
356 | +sys.path.insert(0, os.path.join(_here, '../')) |
357 | + |
358 | +# -- General configuration ----------------------------------------------------- |
359 | + |
360 | +# Add any Sphinx extension module names here, as strings. They can be extensions |
361 | +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. |
362 | +extensions = ['sphinx.ext.autodoc', ] |
363 | + |
364 | +# Add any paths that contain templates here, relative to this directory. |
365 | +templates_path = ['_templates'] |
366 | + |
367 | +# The suffix of source filenames. |
368 | +source_suffix = '.rst' |
369 | + |
370 | +# The encoding of source files. |
371 | +#source_encoding = 'utf-8' |
372 | + |
373 | +# The master toctree document. |
374 | +master_doc = 'index' |
375 | + |
376 | +# General information about the project. |
377 | +project = 'Sloecode' |
378 | +copyright = u'2011, Thomi Richards' |
379 | + |
380 | +# The version info for the project you're documenting, acts as replacement for |
381 | +# |version| and |release|, also used in various other places throughout the |
382 | +# built documents. |
383 | +# |
384 | +# The short X.Y version. |
385 | +version = open(os.path.join('..', '..', 'VERSION')).read().rpartition('.')[0] |
386 | +# The full version, including alpha/beta/rc tags. |
387 | +release = open(os.path.join('..', '..', 'VERSION')).read() |
388 | + |
389 | +# The language for content autogenerated by Sphinx. Refer to documentation |
390 | +# for a list of supported languages. |
391 | +#language = None |
392 | + |
393 | +# There are two options for replacing |today|: either, you set today to some |
394 | +# non-false value, then it is used: |
395 | +#today = '' |
396 | +# Else, today_fmt is used as the format for a strftime call. |
397 | +#today_fmt = '%B %d, %Y' |
398 | + |
399 | +# List of documents that shouldn't be included in the build. |
400 | +#unused_docs = [] |
401 | + |
402 | +# List of directories, relative to source directory, that shouldn't be searched |
403 | +# for source files. |
404 | +exclude_trees = ['_build'] |
405 | + |
406 | +# The reST default role (used for this markup: `text`) to use for all documents. |
407 | +#default_role = None |
408 | + |
409 | +# If true, '()' will be appended to :func: etc. cross-reference text. |
410 | +#add_function_parentheses = True |
411 | + |
412 | +# If true, the current module name will be prepended to all description |
413 | +# unit titles (such as .. function::). |
414 | +#add_module_names = True |
415 | + |
416 | +# If true, sectionauthor and moduleauthor directives will be shown in the |
417 | +# output. They are ignored by default. |
418 | +#show_authors = False |
419 | + |
420 | +# The name of the Pygments (syntax highlighting) style to use. |
421 | +pygments_style = 'sphinx' |
422 | + |
423 | +# A list of ignored prefixes for module index sorting. |
424 | +#modindex_common_prefix = [] |
425 | + |
426 | + |
427 | +# -- Options for HTML output --------------------------------------------------- |
428 | + |
429 | +# The theme to use for HTML and HTML Help pages. Major themes that come with |
430 | +# Sphinx are currently 'default' and 'sphinxdoc'. |
431 | +html_theme = 'default' |
432 | + |
433 | +# Theme options are theme-specific and customize the look and feel of a theme |
434 | +# further. For a list of options available for each theme, see the |
435 | +# documentation. |
436 | +#html_theme_options = {} |
437 | +# Add any paths that contain custom themes here, relative to this directory. |
438 | +#html_theme_path = [] |
439 | + |
440 | +# The name for this set of Sphinx documents. If None, it defaults to |
441 | +# "<project> v<release> documentation". |
442 | +#html_title = None |
443 | + |
444 | +# A shorter title for the navigation bar. Default is the same as html_title. |
445 | +#html_short_title = None |
446 | + |
447 | +# The name of an image file (relative to this directory) to place at the top |
448 | +# of the sidebar. |
449 | +#html_logo = None |
450 | + |
451 | +# The name of an image file (within the static path) to use as favicon of the |
452 | +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 |
453 | +# pixels large. |
454 | +#html_favicon = None |
455 | + |
456 | +# Add any paths that contain custom static files (such as style sheets) here, |
457 | +# relative to this directory. They are copied after the builtin static files, |
458 | +# so a file named "default.css" will overwrite the builtin "default.css". |
459 | +html_static_path = ['_static'] |
460 | + |
461 | +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, |
462 | +# using the given strftime format. |
463 | +#html_last_updated_fmt = '%b %d, %Y' |
464 | + |
465 | +# If true, SmartyPants will be used to convert quotes and dashes to |
466 | +# typographically correct entities. |
467 | +#html_use_smartypants = True |
468 | + |
469 | +# Custom sidebar templates, maps document names to template names. |
470 | +#html_sidebars = {} |
471 | + |
472 | +# Additional templates that should be rendered to pages, maps page names to |
473 | +# template names. |
474 | +#html_additional_pages = {} |
475 | + |
476 | +# If false, no module index is generated. |
477 | +#html_use_modindex = True |
478 | + |
479 | +# If false, no index is generated. |
480 | +#html_use_index = True |
481 | + |
482 | +# If true, the index is split into individual pages for each letter. |
483 | +#html_split_index = False |
484 | + |
485 | +# If true, links to the reST sources are added to the pages. |
486 | +#html_show_sourcelink = True |
487 | + |
488 | +# If true, an OpenSearch description file will be output, and all pages will |
489 | +# contain a <link> tag referring to it. The value of this option must be the |
490 | +# base URL from which the finished HTML is served. |
491 | +#html_use_opensearch = '' |
492 | + |
493 | +# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). |
494 | +#html_file_suffix = '' |
495 | + |
496 | +# Output file base name for HTML help builder. |
497 | +htmlhelp_basename = 'Sloecode doc' |
498 | + |
499 | + |
500 | +# -- Options for LaTeX output -------------------------------------------------- |
501 | + |
502 | +# The paper size ('letter' or 'a4'). |
503 | +#latex_paper_size = 'letter' |
504 | + |
505 | +# The font size ('10pt', '11pt' or '12pt'). |
506 | +#latex_font_size = '10pt' |
507 | + |
508 | +# Grouping the document tree into LaTeX files. List of tuples |
509 | +# (source start file, target name, title, author, documentclass [howto/manual]). |
510 | +latex_documents = [ |
511 | + ('index', 'Sloecode.tex', u'Sloecode Documentation', |
512 | + 'Thomi Richards', 'manual'), |
513 | +] |
514 | + |
515 | +# The name of an image file (relative to this directory) to place at the top of |
516 | +# the title page. |
517 | +#latex_logo = None |
518 | + |
519 | +# For "manual" documents, if this is true, then toplevel headings are parts, |
520 | +# not chapters. |
521 | +#latex_use_parts = False |
522 | + |
523 | +# Additional stuff for the LaTeX preamble. |
524 | +#latex_preamble = '' |
525 | + |
526 | +# Documents to append as an appendix to all manuals. |
527 | +#latex_appendices = [] |
528 | + |
529 | +# If false, no module index is generated. |
530 | +#latex_use_modindex = True |
531 | + |
532 | + |
533 | |
534 | === added file 'docs/source/history.rst' |
535 | --- docs/source/history.rst 1970-01-01 00:00:00 +0000 |
536 | +++ docs/source/history.rst 2011-06-03 03:32:24 +0000 |
537 | @@ -0,0 +1,1 @@ |
538 | +.. include:: ../../HISTORY |
539 | |
540 | === added file 'docs/source/index.rst' |
541 | --- docs/source/index.rst 1970-01-01 00:00:00 +0000 |
542 | +++ docs/source/index.rst 2011-06-03 03:32:24 +0000 |
543 | @@ -0,0 +1,23 @@ |
544 | +======================================= |
545 | +Welcome to Sloecode's documentation! |
546 | +======================================= |
547 | + |
548 | +:Author: Thomi Richards <thomir@gmail.com> |
549 | +:Date: |today| |
550 | +:Description: Sloecode is a simple, installable code-forge that uses Bazaar for revision control. |
551 | + |
552 | + |
553 | +.. toctree:: |
554 | + :maxdepth: 2 |
555 | + |
556 | + overview |
557 | + installation |
558 | + history |
559 | + |
560 | + |
561 | +Indices and tables |
562 | +================== |
563 | + |
564 | +* :ref:`genindex` |
565 | +* :ref:`modindex` |
566 | +* :ref:`search` |
567 | |
568 | === added file 'docs/source/installation.rst' |
569 | --- docs/source/installation.rst 1970-01-01 00:00:00 +0000 |
570 | +++ docs/source/installation.rst 2011-06-03 03:32:24 +0000 |
571 | @@ -0,0 +1,1 @@ |
572 | +.. include:: ../../INSTALL |
573 | |
574 | === added file 'docs/source/overview.rst' |
575 | --- docs/source/overview.rst 1970-01-01 00:00:00 +0000 |
576 | +++ docs/source/overview.rst 2011-06-03 03:32:24 +0000 |
577 | @@ -0,0 +1,5 @@ |
578 | +======== |
579 | +Overview |
580 | +======== |
581 | + |
582 | +.. include:: ../../README |
583 | |
584 | === modified file 'setup.cfg' |
585 | --- setup.cfg 2010-12-14 20:52:13 +0000 |
586 | +++ setup.cfg 2011-06-03 03:32:24 +0000 |
587 | @@ -29,3 +29,11 @@ |
588 | input_file = sloecode/i18n/sloecode.pot |
589 | output_dir = sloecode/i18n |
590 | previous = true |
591 | + |
592 | +[upload_docs] |
593 | +upload-dir = docs/build/html |
594 | + |
595 | +[build_sphinx] |
596 | +source-dir = docs/source |
597 | +build-dir = docs/build |
598 | +all_files = 1 |
599 | |
600 | === modified file 'setup.py' |
601 | --- setup.py 2011-04-29 08:17:09 +0000 |
602 | +++ setup.py 2011-06-03 03:32:24 +0000 |
603 | @@ -5,13 +5,17 @@ |
604 | use_setuptools() |
605 | from setuptools import setup, find_packages |
606 | |
607 | +VERSION = open('VERSION').read().strip() |
608 | + |
609 | setup( |
610 | name='sloecode', |
611 | - version='0.1', |
612 | + version=VERSION, |
613 | description='Sloecode code forge: server component.', |
614 | + long_description=open('README').read(), |
615 | author='Sloecode Developers', |
616 | author_email='sloecode-dev@lists.launchpad.net', |
617 | - url='http://sloecode.launchpad.net', |
618 | + url='http://launchpad.net/sloecode/', |
619 | + license = 'GNU Affero General Public License v3', |
620 | install_requires=[ |
621 | "Pylons>=0.10", |
622 | "SQLAlchemy>=0.6", |
623 | @@ -35,4 +39,19 @@ |
624 | [paste.app_install] |
625 | main = pylons.util:PylonsInstaller |
626 | """, |
627 | + classifiers = ['Development Status :: 4 - Beta', |
628 | + 'Intended Audience :: Developers', |
629 | + 'Intended Audience :: Education', |
630 | + 'Programming Language :: Python', |
631 | + 'Programming Language :: Python :: 2', |
632 | + 'Programming Language :: Python :: 2.6', |
633 | + 'Programming Language :: Python :: 2.7', |
634 | + 'License :: OSI Approved :: GNU Affero General Public License v3', |
635 | + 'Environment :: Web Environment', |
636 | + 'Topic :: Internet', |
637 | + 'Topic :: Internet :: WWW/HTTP', |
638 | + 'Topic :: Software Development', |
639 | + 'Topic :: Software Development :: Version Control', |
640 | + 'Topic :: System :: Software Distribution', |
641 | + ], |
642 | ) |
643 | |
644 | === modified file 'sloecode/templates/admin/person-list.html' |
645 | --- sloecode/templates/admin/person-list.html 2011-04-09 00:11:56 +0000 |
646 | +++ sloecode/templates/admin/person-list.html 2011-06-03 03:32:24 +0000 |
647 | @@ -28,7 +28,10 @@ |
648 | {% set row_class = cycler('odd', 'even') %} |
649 | {% for person in people.items %} |
650 | <tr class="{{row_class.next()}}"> |
651 | - <td>{{h.link_to(person.login|e, '/u/' + (person.login)) }}</td> |
652 | + <td>{{h.link_to(person.login|e, |
653 | + h.url_for(controller='person', |
654 | + action='index', |
655 | + person_name=person.login)) }}</td> |
656 | <td>{{person.name|e}}</td> |
657 | <td>{{person.email|e}}</td> |
658 | <td>{% set roles = [] %} |
659 | |
660 | === modified file 'sloecode/templates/index.html' |
661 | --- sloecode/templates/index.html 2011-04-01 23:50:31 +0000 |
662 | +++ sloecode/templates/index.html 2011-06-03 03:32:24 +0000 |
663 | @@ -13,6 +13,6 @@ |
664 | |
665 | {% if not identity %} |
666 | <p>To get started, You need to |
667 | - {{h.link_to('login!', '/auth/login')}}</p> |
668 | + {{h.link_to('login!', rl_for(controller="auth", action="dologin"))}}</p> |
669 | {% endif %} |
670 | {% endblock %} |
671 | |
672 | === modified file 'sloecode/templates/login.html' |
673 | --- sloecode/templates/login.html 2011-04-18 10:18:25 +0000 |
674 | +++ sloecode/templates/login.html 2011-06-03 03:32:24 +0000 |
675 | @@ -15,7 +15,8 @@ |
676 | <div class="yui3-g"> |
677 | <div id="page_header" class="yui3-u-1"> |
678 | <div class="content-left"> |
679 | - {{ h.form('/auth/dologin', name="login_form") }} |
680 | + {{ h.form(url_for(controller="auth", action="dologin"), |
681 | + name="login_form") }} |
682 | <table> |
683 | <tr> |
684 | <td>Username:</td> |
685 | @@ -29,7 +30,7 @@ |
686 | <td colspan="2"> {{ h.submit('login_btn', 'Login') }} </td> |
687 | </tr> |
688 | </table> |
689 | - {{ h.hidden('came_from', '/me') }} |
690 | + {{ h.hidden('came_from', h.url_for(controller='person', action='me') }} |
691 | {{ h.end_form() }} |
692 | </div> |
693 | </div> |
694 | |
695 | === modified file 'sloecode/templates/project-details.html' |
696 | --- sloecode/templates/project-details.html 2011-04-18 10:18:25 +0000 |
697 | +++ sloecode/templates/project-details.html 2011-06-03 03:32:24 +0000 |
698 | @@ -56,7 +56,10 @@ |
699 | {% endfor %} |
700 | {% if h.has_site_role(h.PROJECT_ADMIN) or user_role == h.PROJECT_ROLES[2] %} |
701 | <dt class="action"> |
702 | - {{ h.link_to('Manage Project Users', '/p/%s/manage_users' % project.name) }} |
703 | + {{ h.link_to('Manage Project Users', |
704 | + h.url_for(controller='project', |
705 | + action='manage_users', |
706 | + project_name=project.name) }} |
707 | </dt> |
708 | {% endif %} |
709 |