[IMP] some doc wording, remove profane comment
This commit is contained in:
parent
a4363385ab
commit
10fd3d201f
|
@ -157,8 +157,8 @@ your credentials (``admin``/``admin`` by default), click
|
||||||
You're now in OpenERP "proper", the backend/administrative
|
You're now in OpenERP "proper", the backend/administrative
|
||||||
interface. We'll deal with it in :ref:`a latter section
|
interface. We'll deal with it in :ref:`a latter section
|
||||||
<howto-website-administration>`, for how click on the
|
<howto-website-administration>`, for how click on the
|
||||||
:guilabel:`Website` menu item, in the top-left of the browser between
|
:menuselection:`Website` menu item, in the top-left of the browser
|
||||||
:guilabel:`Messaging` and :guilabel:`Settings`.
|
between :menuselection:`Messaging` and :menuselection:`Settings`.
|
||||||
|
|
||||||
You're back to your website, but are now an administrator and thus
|
You're back to your website, but are now an administrator and thus
|
||||||
have access to the advanced edition features of an OpenERP-build
|
have access to the advanced edition features of an OpenERP-build
|
||||||
|
@ -222,9 +222,9 @@ As previously mentioned, OpenERP's website module uses bootstrap_ for
|
||||||
much of its basic styles and layout. This, in turns, allows using
|
much of its basic styles and layout. This, in turns, allows using
|
||||||
existing bootstrap themes to alter the color scheme of your website.
|
existing bootstrap themes to alter the color scheme of your website.
|
||||||
|
|
||||||
:guilabel:`Change Theme` opens a picker to a few bundled Bootstrap
|
:menuselection:`Customize --> Change Theme` opens a picker to a few
|
||||||
themes, and lets you change the look of your site quickly and
|
bundled Bootstrap themes, and lets you change the look of your site
|
||||||
on-the-fly.
|
quickly and on-the-fly.
|
||||||
|
|
||||||
.. todo:: creating or installing new boostrap themes?
|
.. todo:: creating or installing new boostrap themes?
|
||||||
|
|
||||||
|
@ -240,10 +240,10 @@ Help
|
||||||
----
|
----
|
||||||
|
|
||||||
Lists available tutorials, step-by-step lessons in using the website.
|
Lists available tutorials, step-by-step lessons in using the website.
|
||||||
``website`` only provides :guilabel:`Insert a banner` which shows some
|
``website`` only provides :menuselection:`Help --> Insert a banner`
|
||||||
basic features of the website (snippets, edition, mobile preview)
|
which shows some basic features of the website (snippets, edition,
|
||||||
while guiding the user through. Other modules can provide additional
|
mobile preview) while guiding the user through. Other modules can
|
||||||
tutorials for their advanced features.
|
provide additional tutorials for their advanced features.
|
||||||
|
|
||||||
Edit
|
Edit
|
||||||
----
|
----
|
||||||
|
@ -265,10 +265,11 @@ Building your pages with OpenERP Website
|
||||||
|
|
||||||
As we've seen, your index page has "disappeared" and been replaced by
|
As we've seen, your index page has "disappeared" and been replaced by
|
||||||
the one provided by ``website``. The page is not lost, but because
|
the one provided by ``website``. The page is not lost, but because
|
||||||
``website`` was installed after ``academy`` module, its page takes
|
``website`` was installed after the ``academy`` module, its index
|
||||||
over routing.
|
page takes over routing (two index pages exist, and one is picked
|
||||||
|
over the other).
|
||||||
|
|
||||||
To fix, that, we can simply add ``website`` as a dependency to
|
To fix the issue, we can simply add ``website`` as a dependency to
|
||||||
``academy`` (that is, tell OpenERP that ``academy`` needs ``website``
|
``academy`` (that is, tell OpenERP that ``academy`` needs ``website``
|
||||||
to work right):
|
to work right):
|
||||||
|
|
||||||
|
@ -283,10 +284,14 @@ to work right):
|
||||||
|
|
||||||
also template issues (see above) (enabled website to "fix")
|
also template issues (see above) (enabled website to "fix")
|
||||||
|
|
||||||
Reload `your openerp`_. Your old index page is back, however none of
|
This will cause ``academy``'s index page to overwrite ``website``'s.
|
||||||
the website edition tools are available. That is because much of these
|
|
||||||
tools are inserted and enabled by the website layout template. Let's
|
Reload `your openerp`_. Your old index page is back.
|
||||||
use that instead of our own page structure:
|
|
||||||
|
However, none of the website edition tools are available. That is
|
||||||
|
because much of these tools are inserted and enabled by the website
|
||||||
|
layout template. Let's use that layout instead of our own page
|
||||||
|
structure:
|
||||||
|
|
||||||
.. patch::
|
.. patch::
|
||||||
|
|
||||||
|
@ -295,8 +300,8 @@ use that instead of our own page structure:
|
||||||
customization tools.
|
customization tools.
|
||||||
|
|
||||||
* there's quite a bit of complex markup, used as hooks for various
|
* there's quite a bit of complex markup, used as hooks for various
|
||||||
features (e.g. snippets). Although technically not entirely
|
features (e.g. snippets). Although technically not mandatory, some
|
||||||
necessary, some things will not work if they're not there.
|
things will not work if they're not there.
|
||||||
|
|
||||||
* if you go in the HTML editor (:menuselection:`Customize --> HTML
|
* if you go in the HTML editor (:menuselection:`Customize --> HTML
|
||||||
Editor`), you can see and edit your template
|
Editor`), you can see and edit your template
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# HG changeset patch
|
# HG changeset patch
|
||||||
# Parent 559e3266ed1eeba384445016ffd1438eed54f144
|
# Parent 0e882bf90a845788e155b437baf2b42c98901216
|
||||||
|
|
||||||
diff --git a/__openerp__.py b/__openerp__.py
|
diff --git a/__openerp__.py b/__openerp__.py
|
||||||
--- a/__openerp__.py
|
--- a/__openerp__.py
|
||||||
|
@ -15,7 +15,7 @@ diff --git a/__openerp__.py b/__openerp__.py
|
||||||
diff --git a/controllers.py b/controllers.py
|
diff --git a/controllers.py b/controllers.py
|
||||||
--- a/controllers.py
|
--- a/controllers.py
|
||||||
+++ b/controllers.py
|
+++ b/controllers.py
|
||||||
@@ -17,41 +17,11 @@ class Home(main.Home):
|
@@ -17,41 +17,10 @@ class Home(main.Home):
|
||||||
for i, ta in enumerate(teaching_assistants)
|
for i, ta in enumerate(teaching_assistants)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -43,7 +43,6 @@ diff --git a/controllers.py b/controllers.py
|
||||||
-""" % {
|
-""" % {
|
||||||
- 'tas': '\n'.join(tas)
|
- 'tas': '\n'.join(tas)
|
||||||
- }
|
- }
|
||||||
+ # how in fuck do I get a db here?
|
|
||||||
+ return "" % {
|
+ return "" % {
|
||||||
+ 'tas': '\n'.join(tas)
|
+ 'tas': '\n'.join(tas)
|
||||||
+ }
|
+ }
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# HG changeset patch
|
# HG changeset patch
|
||||||
# Parent 5a5145642f3604f09c5685d37beaddc497d3c850
|
# Parent 77db36690ddd8ad5065cab77837deec9da3df502
|
||||||
|
|
||||||
diff --git a/__openerp__.py b/__openerp__.py
|
diff --git a/__openerp__.py b/__openerp__.py
|
||||||
--- a/__openerp__.py
|
--- a/__openerp__.py
|
||||||
|
@ -15,7 +15,7 @@ diff --git a/__openerp__.py b/__openerp__.py
|
||||||
diff --git a/controllers.py b/controllers.py
|
diff --git a/controllers.py b/controllers.py
|
||||||
--- a/controllers.py
|
--- a/controllers.py
|
||||||
+++ b/controllers.py
|
+++ b/controllers.py
|
||||||
@@ -10,18 +10,12 @@ teaching_assistants = [
|
@@ -10,17 +10,12 @@ teaching_assistants = [
|
||||||
]
|
]
|
||||||
|
|
||||||
class Home(main.Home):
|
class Home(main.Home):
|
||||||
|
@ -30,7 +30,6 @@ diff --git a/controllers.py b/controllers.py
|
||||||
+ 'tas': teaching_assistants,
|
+ 'tas': teaching_assistants,
|
||||||
+ })
|
+ })
|
||||||
|
|
||||||
- # how in fuck do I get a db here?
|
|
||||||
- return "" % {
|
- return "" % {
|
||||||
- 'tas': '\n'.join(tas)
|
- 'tas': '\n'.join(tas)
|
||||||
- }
|
- }
|
||||||
|
|
Loading…
Reference in New Issue