Permalink
Browse files

tweaks

  • Loading branch information...
1 parent e5f59e7 commit 32643adaa6a8c36c6e3c2076d288b31d542a4311 @flurdy committed Dec 4, 2012
Showing with 16 additions and 19 deletions.
  1. +10 −14 app/views/about.scala.html
  2. +2 −2 app/views/wishlist/showwish.scala.html
  3. +2 −2 conf/application.conf
  4. +2 −1 public/stylesheets/cargo.css
View
@@ -4,41 +4,37 @@
@nautical("about") {
<li><a href="@routes.Application.about">about</a></li>
-
+
}{
<div id="about-page">
<h3>About Wish</h3>
<div class="well">
- <ul class="unstyled">
+ <ul class="unstyled">
<li>Website: <a href="http://wishlist.sourceforge.net">wishlist.sourceforge.net</a></li>
<!-- <li>Project: <s title="Out dated. See Github instead"><a href="http://sourceforge.net/projects/wishlist">sourceforge.net/projects/wishlist</a></s></li> -->
<li>Source: <a href="http://github.com/flurdy/wishlist">github.com/flurdy/wishlist</a></li>
<li>Tasks: <a href="http://pivotaltracker.com/projects/101944">pivotaltracker.com/projects/101944</a></li>
<!-- <li>Wiki: <s title="Lots of information. Mostly out dated"><a href="http://sf.net/apps/mediawiki/wishlist/">sf.net/apps/mediawiki/wishlist/</a></s></li> -->
<li><br/></li>
- <li>License: AGPL v3</li>
- </ul>
+ <li>License: Lesser AGPL v3</li>
+ </ul>
</div>
<div class="well">
<p>
- Summary:
- A place to store and share wish lists
- </p>
- <p>
- Future plans:
+ Summary:
+ A place to store and share wish lists
</p>
+ <!-- <p>
+ Future plans:
+ </p> -->
<ul>
- <li>Multiple cross referenced lists</li>
- <li>Private / public / shielded from recipient(s)</li>
+ <li>Multiple cross referenced lists <i class="icon-ok"></i></li>
<li>Wish item reservation <i class="icon-ok"></i></li>
- <li>Wish item collaboration</li>
- <li>Integrate with gift registry</li>
- <li>Integrate with shopping plans</li>
</ul>
</div>
@@ -43,9 +43,9 @@
}
@if(currentRecipient.isDefined && wishlist.recipient != currentRecipient.get && wish.reservation.isDefined){
<div class="reserved">reserved</div>
- <s><a href="#wishModal-@wish.wishId.get" role="button" class="" data-toggle="modal">@titleCapper(wish.title,wish.description)</a></s> &nbsp;&nbsp; <s><small class="wish-description" class="muted">@descriptionCapper(wish.title,wish.description)</small></s>
+ <s><a href="#wishModal-@wish.wishId.get" role="button" class="" data-toggle="modal">@titleCapper(wish.title,wish.description)</a></s> &nbsp;&nbsp; <small class="wish-description" class="muted"><a href="#wishModal-@wish.wishId.get" role="button" class="" data-toggle="modal"><s>@descriptionCapper(wish.title,wish.description)</s></a><small>
} else {
- <a href="#wishModal-@wish.wishId.get" role="button" class="" data-toggle="modal">@titleCapper(wish.title,wish.description)</a> &nbsp;&nbsp; <small class="wish-description" class="muted">@descriptionCapper(wish.title,wish.description)</small>
+ <a href="#wishModal-@wish.wishId.get" role="button" class="" data-toggle="modal">@titleCapper(wish.title,wish.description)</a> &nbsp;&nbsp; <small class="wish-description" class="muted"><a href="#wishModal-@wish.wishId.get" role="button" class="" data-toggle="modal">@descriptionCapper(wish.title,wish.description)</a></small>
}
View
@@ -18,7 +18,7 @@ application.langs="en,en-gb"
# global=Global
# Database configuration
-# ~~~~~
+# ~~~~~
# You can declare as many datasources as you want.
# By convention, the default datasource is named `default`
#
@@ -32,7 +32,7 @@ db.default.url="jdbc:h2:target/db/wish"
# ~~~~~
# You can disable evolutions if needed
# evolutionplugin=disabled
-applyEvolutions.default=false
+applyEvolutions.default=true
# Logger
# ~~~~~
@@ -147,6 +147,7 @@ ul.vertical li a { }
#cargo .capthca { width: 7em; height: 3.5em; border: 2px inset silver; padding: 0.2em; margin: 0.5em; }
-
+#cargo small a,
+#cargo small a:visited { color: black; }

0 comments on commit 32643ad

Please sign in to comment.