
Prior to this commit, the Odoo documentation was mainly split between two repositories: odoo/odoo/doc and odoo/documentation-user. Some bits of documentation were also hosted elsewhere (e.g., wiki, upgrade, ...). This was causing several problems among which: - The theme, config, Makefile, and similar technical resources had to be duplicated. This resulted in inconsistent layout, features, and build environments from one documentation to another. - Some pages did not fit either documentation as they were relevant for both users and developers. Some were relevant to neither of the two (e.g., DB management). - Cross-doc references had to be absolute links and they broke often. - Merging large image files in the developer documentation would bloat the odoo/odoo repository. Some contributions had to be lightened to avoid merging too many images (e.g., Odoo development tutorials). - Long-time contributors to the user documentation were chilly about going through the merging process of the developer documentation because of the runbot, mergebot, `odoo-dev` repository, etc. - Some contributors would look for the developer documentation in the `odoo/documentation-user` repository. - Community issues about the user documentation were submitted on the `odoo/odoo` repository and vice-versa. Merging all documentations in one repository will allow us to have one place, one theme, one work process, and one set of tools (build environment, ...) for all of the Odoo docs. As this is a good opportunity to revamp the layout of the documentation, a brand new theme replaces the old one. It features a new way to navigate the documentation, centered on the idea of always letting the reader know what is the context (enclosing section, child pages, page structure ...) of the page they are reading. The previous theme would quickly confuse readers as they navigated the documentation and followed cross-application links. The chance is also taken to get rid of all the technical dangling parts, performance issues, and left-overs. Except for some page-specific JS scripts, the Odoo theme Sphinx extension is re-written from scratch based on the latest Sphinx release to benefit from the improvements and ease future contributions. task-2351938 task-2352371 task-2205684 task-2352544 Closes #945
57 lines
2.3 KiB
Plaintext
57 lines
2.3 KiB
Plaintext
Index: coalroller_service/coalroller_service/controllers/main.py
|
|
===================================================================
|
|
--- coalroller_service.orig/coalroller_service/controllers/main.py
|
|
+++ coalroller_service/coalroller_service/controllers/main.py
|
|
@@ -10,12 +10,14 @@ class CoalBurnerController(http.Controll
|
|
def roll(self, account_token):
|
|
# the service key *is a secret*, it should not be committed in
|
|
# the source
|
|
- service_key = self.env['ir.config_parameter'].sudo().get_param('coalroller.service_key')
|
|
+ service_key = http.request.env['ir.config_parameter'].sudo().get_param('coalroller.service_key')
|
|
|
|
# we charge 1 credit for 10 seconds of CPU
|
|
cost = 1
|
|
# TODO: allow the user to specify how many (tens of seconds) of CPU they want to use
|
|
- with charge(http.request.env, service_key, account_token, cost):
|
|
+ with charge(http.request.env, service_key, account_token, cost,
|
|
+ description="We're just obeying orders",
|
|
+ credit_template='coalroller_service.no_credit'):
|
|
|
|
# 10 seconds of CPU per credit
|
|
end = time.time() + (10 * cost)
|
|
Index: coalroller_service/coalroller_service/views/no-credit.xml
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ coalroller_service/coalroller_service/views/no-credit.xml
|
|
@@ -0,0 +1,18 @@
|
|
+<odoo>
|
|
+ <template id="no_credit" name="No credit warning">
|
|
+ <div>
|
|
+ <div class="container-fluid">
|
|
+ <div class="row">
|
|
+ <div class="col-md-7 offset-lg-1 mt32 mb32">
|
|
+ <h2>Consume electricity doing nothing useful!</h2>
|
|
+ <ul>
|
|
+ <li>Heat our state of the art data center for no reason</li>
|
|
+ <li>Use multiple watts for only 0.1€</li>
|
|
+ <li>Roll coal without going outside</li>
|
|
+ </ul>
|
|
+ </div>
|
|
+ </div>
|
|
+ </div>
|
|
+ </div>
|
|
+ </template>
|
|
+</odoo>
|
|
Index: coalroller_service/coalroller_service/__manifest__.py
|
|
===================================================================
|
|
--- coalroller_service.orig/coalroller_service/__manifest__.py
|
|
+++ coalroller_service/coalroller_service/__manifest__.py
|
|
@@ -2,4 +2,7 @@
|
|
'name': "Coal Roller Service",
|
|
'category': 'Tools',
|
|
'depends': ['iap'],
|
|
+ 'data': [
|
|
+ 'views/no-credit.xml',
|
|
+ ],
|
|
}
|