Merge branch 'master' into 2939-orgs

README.rst

@@ -1,35 +1,45 @@
-CKAN is open-source data hub software. CKAN makes it easy to publish, share and
-work with data. It's a data management system that provides a powerful platform
-for cataloging, storing and accessing datasets with a rich front-end, full API
-(for both data and catalog), visualization tools and more. Read more at
-http://ckan.org/. 
+CKAN: The Open Source Data Portal Software
+==========================================
 
- * Installation instructions: see docs at http://docs.ckan.org/
- * Project wiki: http://wiki.ckan.org/
- * Developer mailing list: ckan-dev@lists.okfn.org
- * Issue tracker: http://trac.ckan.org/
+**CKAN is the world’s leading open-source data portal platform**.
+CKAN makes it easy to publish, share and work with data. It's a data management
+system that provides a powerful platform for cataloging, storing and accessing
+datasets with a rich front-end, full API (for both data and catalog), visualization
+tools and more. Read more at `ckan.org <http://ckan.org/>`_. 
 
-Building Documentation
-======================
 
-1. Install python-sphinx (>= 1.1)
+Installation
+------------
 
-2. Initialize the theme submodule::
+See the `CKAN Documentation <http://docs.ckan.org>`_ for installation instructions.
 
-    git submodule init
-    git submodule update
 
-3. Run the command to build the docs::
+Community
+---------
+
+* Developer mailing list: `ckan-dev@lists.okfn.org <http://lists.okfn.org/mailman/listinfo/ckan-dev>`_
+* Developer IRC channel: #ckan on `irc.freenode.net <http://freenode.net/>`_
+* Issue tracker: `trac.ckan.org <http://trac.ckan.org/>`_
+* `CKAN tag on StackOverflow <http://stackoverflow.com/questions/tagged/ckan>`_
+
+
+Contributing to CKAN
+--------------------
+
+CKAN is a free software project and code contributions are welcome.
+The `For CKAN Developers <http://docs.ckan.org/en/latest/index.html#for-ckan-developers>`_
+section of the documentation explains how to contribute to CKAN or its documentation,
+including our **coding standards**.
+
+The `CKAN Wiki <https://github.com/okfn/ckan/wiki>`_ is also open fo contributions.
 
-    python setup.py build_sphinx
 
 Copying and License
-===================
+-------------------
 
 This material is copyright (c) 2006-2011 Open Knowledge Foundation.
 
 It is open and licensed under the GNU Affero General Public License (AGPL) v3.0
 whose full text may be found at:
 
-http://www.fsf.org/licensing/licenses/agpl-3.0.html
-
+http://www.fsf.org/licensing/licenses/agpl-3.0.html

ckan/config/deployment.ini_tmpl

@@ -235,6 +235,14 @@ ckan.feeds.author_link =
 #ofs.aws_access_key_id = ....
 #ofs.aws_secret_access_key = ....
 
+
+# DEBUGGING
+
+# ckan.debug_supress_header This option can be set to suppress the debug
+# information showing the controller and action recieving the request being
+# shown in the header.  Note: This info only shows if debug is set to true.
+ckan.debug_supress_header = false
+
 ## ===================================
 ## Extensions
 

ckan/lib/app_globals.py

@@ -161,5 +161,7 @@ def _init(self):
         datasets_per_page = int(config.get('ckan.datasets_per_page', '20'))
         self.datasets_per_page = datasets_per_page
 
+        self.debug_supress_header = asbool(config.get('ckan.debug_supress_header', 'false'))
+
 app_globals = _Globals()
 del _Globals

ckan/public/base/less/masthead.less

@@ -194,11 +194,9 @@ header.masthead {
 
 	.debug {
 		position: absolute;
-		bottom: 10px;
+		top: 10px;
 		left: 10px;
-		font-size: 11px;
 		color: rgba(255, 255, 255, 0.5);
-		line-height: 1.2;
 	}
 
 }

ckan/templates/header.html

@@ -1,5 +1,5 @@
 <header class="masthead">
-  {% if config.debug %}
+  {% if config.debug and not g.debug_supress_header %}
     <div class="debug">Controller : {{ c.controller }}<br/>Action : {{ c.action }}</div>
   {% endif %}
   <div class="container">