From: Gabriel Dunne <gdunne@quilime.com>
Date: Sun, 18 Dec 2011 17:01:18 +0000 (-0800)
Subject: expanding description, tags
X-Git-Tag: v0.1~58
X-Git-Url: https://git.quilime.com/?a=commitdiff_plain;h=7255ce97f66f5cf8dfed10a1560eed29738ce2a1;p=clmpr.git

expanding description, tags
---

diff --git a/clmpr.sql b/clmpr.sql
index 4fd7446..ac03432 100644
--- a/clmpr.sql
+++ b/clmpr.sql
@@ -1,30 +1,32 @@
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 
--- Database: `clmpr`
+-- Database Name: `clmpr`
 
-
--- Table structure for table `clumps`
-
-CREATE TABLE IF NOT EXISTS `clumps` (
+CREATE TABLE `clumps` (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `user_id` int(9) NOT NULL,
   `title` varchar(255) NOT NULL,
   `url` varchar(255) NOT NULL DEFAULT '',
+  `description` text NOT NULL,
   `tags` text NOT NULL,
   `date` datetime NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
+CREATE TABLE `tags` (
+  `id` int(9) NOT NULL AUTO_INCREMENT,
+  `tag` varchar(255) NOT NULL,
+  `count` int(9) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `tag` (`tag`)
+) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
 
--- Table structure for table `users`
-
-CREATE TABLE IF NOT EXISTS `users` (
+CREATE TABLE `users` (
   `id` int(9) NOT NULL AUTO_INCREMENT,
   `user` varchar(255) NOT NULL,
   `pass` varchar(255) NOT NULL,
   `created` datetime NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `user` (`user`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
diff --git a/get.php b/get.php
index 730f871..34679a9 100644
--- a/get.php
+++ b/get.php
@@ -76,27 +76,23 @@ case 'xml' :
     <li>
 
         <?php if ($hasDescription) : ?>
-        <a href="#" onClick="$(this.parentNode).toggleClass('expand');" title="expand">+</a>
+        <a href="#" class="more" onClick="$(this.parentNode).addClass('expand');">+</a>
+        <a href="#" class="less" onClick="$(this.parentNode).removeClass('expand');">-</a>
         <?php else : ?>
         &nbsp; 
         <?php endif; ?>
 
-        <span class="meta">
-            <?php echo date("Y-m-d", strtotime($row['date'])) ?> by 
-            <a class="uname" href="/?user=<?php echo $row['user'] ?>"><?php echo $row['user'] ?></a>
-        </span>
             
         <span class="url">
             <a href="<?php echo $row['url'] ?>">
                 <?php echo $row['title'] ? $row['title'] : "&lt;title&gt;" ?>
             </a>
         </span>
-    
-        <ul class="tags">
-            <?php foreach($row['tags'] as $tag) : ?>
-            <li><a href="/tags.php?tag=<?=$tag?>"><?=$tag?></a></li>
-            <? endforeach; ?>
-        </ul>
+
+        <span class="meta">
+            <?php echo date("Y-m-d", strtotime($row['date'])) ?> by 
+            <a class="uname" href="/?user=<?php echo $row['user'] ?>"><?php echo $row['user'] ?></a>
+        </span>
 
         <?php 
         if ($user = get_user()):
@@ -107,13 +103,23 @@ case 'xml' :
         <?php   
             endif;
         endif; 
-        ?>
+        ?>        
 
-        <?php if ($hasDescription) : ?>
-            <p class="desc">
-            <?php echo $row['description']; ?>
-            </p>
-        <?php endif; ?>  
+        <div class="expand">
+    
+            <?php if ($hasDescription) : ?>
+                <p class="desc">
+                <?php echo $row['description']; ?>
+                </p>
+            <?php endif; ?>      
+
+            <ul class="tags">
+                <?php foreach($row['tags'] as $tag) : ?>
+                <li><a href="/tags.php?tag=<?=$tag?>"><?=$tag?></a></li>
+                <? endforeach; ?>
+            </ul>
+
+        </div>
 
     </li>
 
diff --git a/style.css b/style.css
index b29a841..971a6c1 100644
--- a/style.css
+++ b/style.css
@@ -56,12 +56,31 @@ ul.links li span.meta a {
     color:#999;
 }
 ul.links li p.desc {
-    margin:1em 0 1em 2em;
+    margin:0;
+    /*display:none;*/
+}
+ul.links li .expand {
     display:none;
+    margin:0 0 1em 1em;
 }
-ul.links li.expand p.desc {
+ul.links li.expand .expand {
     display:block;
 }
+ul.links li.expand p.desc {
+    /*display:block;*/
+}
+ul.links li .less {
+    display:none;
+}
+ul.links li .more {
+    display:inline;
+}
+ul.links li.expand .more {
+    display:none;
+}
+ul.links li.expand .less {
+    display:inline;
+}
 
 .delete {
     font-weight:bold;