Merge branch 'feature-2375-demo-theme-working' into feature-2375-demo…

…-theme
ckan · May 16, 2012 · b4992f7 · b4992f7
2 parents f134c52 + d504963
commit b4992f7
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/ckan/public/base/less/ckan.less b/ckan/public/base/less/ckan.less
@@ -8,6 +8,7 @@
 @import "layout.less";
 @import "masthead.less";
 @import "footer.less";
+@import "disqus.less";
 
 body {
   // Using the masthead/footer gradient prevents the color from changing

diff --git a/ckan/public/base/less/dataset.less b/ckan/public/base/less/dataset.less
@@ -58,8 +58,9 @@
 .search-giant input {
   .box-sizing(border-box);
   font-size: 16px;
-  padding: 22px 10px;
+  padding: 14px 10px;
   width: 100%;
+  height: auto;
 }
 
 .search-giant button {

diff --git a/ckan/public/base/less/disqus.less b/ckan/public/base/less/disqus.less
@@ -0,0 +1,11 @@
+.disqus-trackback .field {
+  padding: 4px;
+}
+
+.disqus-trackback .field input {
+  .box-sizing(border-box);
+  width: 100%;
+  height: auto;
+  margin: 0;
+  padding: 8px 5px;
+}
diff --git a/ckan/public/base/less/module.less b/ckan/public/base/less/module.less
@@ -42,7 +42,6 @@
 
 .module > .footer {
   padding: 0 @module-margin-x 7px;
-  margin: -17px 0 0;
 }
 
 .module .read-more {
@@ -82,13 +81,20 @@
 
 .module.info > .content {
   padding: 10px;
+  margin: 0;
 }
 
 .module.info small {
   font-size: 11px;
   display: block;
 }
 
+// Action
+
+.module .action {
+  text-align: center;
+}
+
 // Secondary column specific
 
 .secondary .module {

diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
@@ -143,12 +143,21 @@ <h2 class="heading">Social</h2>
           </ul>
         </section>
 
-        <section class="module info related">
-          <h2 class="heading">Related</h2>
+        <section class="module info related" py:if="True">
+          <h2 class="heading">Related <a class="action" href="#">Add Related</a></h2>
           <p class="content">Some interesting summary of this featured item. This
           may or may not have a slideshow.</p>
         </section>
 
+        <section class="module info related empty" py:if="True">
+          <h2 class="heading">Related</h2>
+          <div class="content">
+            <p>No apps, ideas, news stories or images have been
+            related to this dataset yet, why not add one now?</p>
+            <p class="action"><a class="btn" href="#">Add Item</a></p>
+          </div>
+        </section>
+
         <section py:if="c.pkg.license_id" class="module info license">
           <h2 class="heading">License</h2>
           <p class="content">
@@ -161,9 +170,9 @@ <h2 class="heading">License</h2>
           </p>
         </section>
 
-        <section class="module trackback">
+        <section class="module disqus-trackback">
           <h2 class="heading">Trackback URL</h2>
-          <input type="text" value="" />
+          <div class="field"><input type="text" value="http://trackback.com" /></div>
         </section>
       </aside>
     </body>