[ckan-dev] ckan.net edits

Tue Feb 22 13:45:08 UTC 2011

They are mine, made with James Gardner last week. Please don't revert them
:) I will aim to factor them out soon into a separate 'ckan-community' repo
or the like

Rufus

PS: what changes are you trying to deploy that this is causing problems
with?

On 22 February 2011 12:21, David Read <david.read at okfn.org> wrote:

> Can anyone claim the unchecked in changes that have been hanging
> around on ckan.net? Can I simply revert them or does anyone want to
> check them in (to default)?
>
> David
>
> okfn at eu7:~/var/srvc/ckan.net/pyenv/src/ckan$ hg diff
> diff -r 744c77720c9d ckan/public/css/ckan.css
> --- a/ckan/public/css/ckan.css  Tue Feb 22 12:14:56 2011 +0000
> +++ b/ckan/public/css/ckan.css  Tue Feb 22 12:16:57 2011 +0000
> @@ -118,14 +118,14 @@
>   float: left;
>   clear: left;
>   color: #000;
> -  font-style: italic;
> -  font-size: 15px;
> +  font-style: normal;
> +  font-size: 13px;
>   letter-spacing: normal;
>   text-transform: none;
> -  margin: 0;
> -  margin-top: -5px;
> -  padding: 0 0 10px 0;
> +  margin: -5px 0 10px 3px;
> +  padding: 0;
>   font-family: 'Lucida Grande', 'Lucida Sans Unicode', Lucida, Arial,
> Helvetica, sans-serif;
> +  font-family: 'Helvetica Neue', Arial, Helvetica, 'Nimbus Sans L',
> sans-serif;
>  }
>
>  /* ===========================
> @@ -514,6 +514,11 @@
>  /* = Search boxes = */
>  /* ================ */
>
> +hr.clear {
> +  clear: both;
> +  visibility: hidden;
> +}
> +
>  form.package-search input.search {
>   width: 99%;
>   padding: 5px;
> @@ -802,7 +807,7 @@
>   display: inline;
>  }
>
> -#content .package .subsection h3,
> +#content .subsection h3,
>  #content #comments h3, #content #comments h4 {
>   background-color: #444;
>   padding: 10px;
> diff -r 744c77720c9d ckan/templates/home/index.html
> --- a/ckan/templates/home/index.html    Tue Feb 22 12:14:56 2011 +0000
> +++ b/ckan/templates/home/index.html    Tue Feb 22 12:16:57 2011 +0000
> @@ -39,35 +39,19 @@
>   </py:def>
>
>   <div py:match="content">
> -    <h2>Welcome to ${g.site_title}</h2>
> -    <p i18n:msg="title">
> -      ${g.site_title} is an
> -      <a href="http://www.opendefinition.org/ossd/">open registry</a>
> -      of data and content packages. Harnessing the CKAN software, this
> -      site makes it easy to find, share and reuse content and data,
> -      especially in ways that are machine automatable.
> -    </p>
> -
> -    <p i18n:msg="package_count"><strong>${c.package_count} registered
> data packages</strong> available.</p>
> +    <h2>Search ${g.site_title}</h2>
>
>     <xi:include href="../package/search_form.html" />
> -
> -    <py:if test="len(c.facets.get('tags', {}))">
> -        <h4>Top Tags</h4>
> -        <div id="tagcloud">
> -        <py:for each="tag_name, count in c.facets.get('tags',
> {}).items()">
> -          <a rel="${count}" title="${count}"
> href="${h.url_for(controller='tag',
> -            action='read', id=tag_name)}">${tag_name}</a>
> -        </py:for>
> -        </div>
> -        <hr />
> -    </py:if>
>
> -    <h4>Recently changed packages</h4>
> +    <p i18n:msg="package_count"><strong>${c.package_count} registered
> dataset collections</strong> available.</p>
> +
> +    <div class="subsection" style="margin-top: 2em;">
> +    <h3>Recently changed</h3>
>     ${package_list(c.latest_packages)}
>
>     <p><a href="${h.url_for(controller='revision', action='index',
>       id=None)}">View revision log »</a></p>
> +    </div>
>   </div>
>
>   <xi:include href="layout.html" />
> diff -r 744c77720c9d ckan/templates/layout_base.html
> --- a/ckan/templates/layout_base.html   Tue Feb 22 12:14:56 2011 +0000
> +++ b/ckan/templates/layout_base.html   Tue Feb 22 12:16:57 2011 +0000
> @@ -93,11 +93,10 @@
>       <div class="menu">
>         <ul>
>           <li>${h.nav_link(c, _('Home'), controller='home',
> action='index', id=None)}</li>
> -          <li>${h.nav_link(c, _('Search'), controller='package',
> action='index', id=None, highlight_actions = 'search index')}</li>
> -          <li py:if="h.am_authorized(c,
> actions.PACKAGE_CREATE)">${h.nav_link(c, _('Add a package'),
> controller='package', action='new', id=None)}</li>
> -          <li>${h.nav_link(c, _('Tags'), controller='tag',
> action='index', id=None)}</li>
> +          <li py:if="h.am_authorized(c,
> actions.PACKAGE_CREATE)">${h.nav_link(c, _('Add a dataset'),
> controller='package', action='new', id=None)}</li>
>           <li>${h.nav_link(c, _('Groups'), controller='group',
> action='index', id=None, highlight_actions = 'new index')}</li>
>           <li>${h.nav_link(c, _('About'), controller='home',
> action='about', id=None)}</li>
> +          <li><a href="http://wiki.ckan.net/">Help</a></li>
>       </ul>
>       </div> <!-- .menu -->
>     </div> <!-- #access -->
> diff -r 744c77720c9d ckan/templates/package/new.html
> --- a/ckan/templates/package/new.html   Tue Feb 22 12:14:56 2011 +0000
> +++ b/ckan/templates/package/new.html   Tue Feb 22 12:16:57 2011 +0000
> @@ -4,6 +4,7 @@
>   py:strip="">
>
>   <py:def function="page_title">New - Data Packages</py:def>
> +  <py:def function="body_class">package-new</py:def>
>
>   <py:def function="optional_head">
>     <link rel="stylesheet" href="${g.site_url}/css/forms.css"
> type="text/css" media="screen, print" />
> diff -r 744c77720c9d ckan/templates/package/search_form.html
> --- a/ckan/templates/package/search_form.html   Tue Feb 22 12:14:56 2011
> +0000
> +++ b/ckan/templates/package/search_form.html   Tue Feb 22 12:16:57 2011
> +0000
> @@ -12,10 +12,8 @@
>     <input type="hidden" name="${k}" value="${v}" />
>   </py:for>
>   </span>
> -  <div class="package-search-filters">Filter by <label
> for="open_only" class="inline">${h.checkbox(name='open_only',
> checked=c.open_only)} packages with open licenses</label>
> -  <label for="downloadable_only"
> class="inline">${h.checkbox(name='downloadable_only',
> checked=c.downloadable_only)} packages with downloads</label>
>   <input type="submit" value="${_('Search')}" class="button" />
> -  </div>
> +  <hr class="clear" />
>  </form>
>
>  </html>
>
> _______________________________________________
> ckan-dev mailing list
> ckan-dev at lists.okfn.org
> http://lists.okfn.org/mailman/listinfo/ckan-dev
>

-- 
Co-Founder, Open Knowledge Foundation
Promoting Open Knowledge in a Digital Age
http://www.okfn.org/ - http://blog.okfn.org/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.okfn.org/pipermail/ckan-dev/attachments/20110222/813504c9/attachment-0001.html>