css tweaks per stefan, updated press coverage

frontend/forms.py

@@ -204,7 +204,7 @@ class EmailShareForm(forms.Form):
 	next = forms.CharField(widget=forms.HiddenInput())
 	
 class FeedbackForm(forms.Form):
-	sender = forms.EmailField(widget=forms.TextInput(attrs={'size':50}))
+	sender = forms.EmailField(widget=forms.TextInput(attrs={'size':50}), label="Your email")
 	subject = forms.CharField(max_length=500, widget=forms.TextInput(attrs={'size':50}))
 	message = forms.CharField(widget=forms.Textarea())
 	page = forms.CharField(widget=forms.HiddenInput())

frontend/templates/explore.html

@@ -7,13 +7,17 @@
                         <li class="first parent">
                             <span>Show me...</span>
                             <ul class="menu level2">
-                            {% if is_preview %}
+                            {% if request.user.is_anonymous %}
                                 <li class="first"><a href="{% url work_list 'recommended' %}"><span>Recommended</span></a></li>
+                            {% else %}
+                                <li class="first"><a href="/"><span>My Wishlist</span></a></li>
+                                <li><a href="{% url work_list 'recommended' %}"><span>Recommended</span></a></li>    
+                            {% endif %}
+                            {% if is_preview %}
                                 <li><a href="{% url work_list 'popular' %}"><span>Popular</span></a></li>
                                 <li><a href="{% url unglued_list 'recent' %}"><span>Recently unglued</span></a></li>
                                 <li class="last"><a href="{% url work_list 'new' %}"><span>Newly Wished</span></a></li>
                             {% else %}
-                                <li class="first"><a href="{% url work_list 'recommended' %}"><span>Recommended</span></a></li>
                                 <li><a href="{% url work_list 'popular' %}"><span>Popular</span></a></li>
                                 <li><a href="{% url campaign_list 'pledges' %}" class="comingsoon"><span>Most pledges</span></a></li>
                                 <li><a href="{% url campaign_list 'pledged' %}" class="comingsoon"><span>Biggest campaigns</span></a></li>

frontend/templates/faq.html

@@ -51,6 +51,19 @@ For some examples of how authors and publishers have made free ebooks work for t
 
 <dd>Lots of reasons!  Unglued ebooks may be part of a marketing strategy to publicize other books or increase the value of an author's brand.  Or they may be books that are no longer selling through conventional channels, and ungluing them is a low-risk way to get some extra value out of them.  Or ungluing provides a simple digital strategy that pays for itself.  Or the books may have been written to advance a cause, add to the public conversation, or increase human knowledge.  These books succeed by having as many readers as possible.</dd>
 
+<dt>Does Unglue.It publish books?  Can I self-publish here?</dt>
+
+<dd>No.  Unglue.It is concerned with relicensing works, not publishing them.  We only work with books that have been traditionally published.  We are not a publisher.<br /><br /> 
+If you're interested in self-publishing, there are lots of fine options elsewhere.  If you have an unpublished work that you're looking to publish traditionally, we wish you the best of luck and we would be happy to work with you after your book has been published.</dd>
+
+<dt>What's a rights holder?  How can I tell if I'm one?</dt>
+
+<dd>A rights holder is the person (or entity) which holds the legal right to copy, distribute, or sell a book in some way.  There may be one entity with all the rights to a work, or the rights may be split up among different entities: for example, one who publishes the print edition in the United States, another who publishes the print edition in the EU, another who holds electronic rights, et cetera.  For ungluing purposes, the rights holder is the entity who has uncontested worldwide electronic rights to a work.<br /><br />
+If you have written a book and not signed any contracts about it, you hold all the rights.  If you have signed a contract with a publisher to produce, distribute, publish, or sell your work in a particular format or a particular territory, whether or not you still hold rights depends on the language of that contract.  We encourage you to check your contracts.  It may be in both your interests to explore launching an Unglue.It campaign.<br /><br />
+If you have self-published a work, there may be restrictions on your rights.  However, Unglue.It does not deal in self-published works.<br /><br />
+If you haven't written a book but you have had business or family relationships with someone who has, it's possible that you are a rights holder (for instance, you may have inherited rights from the author's estate, or your company may have acquired them during a merger).  Again, this all depends on the specific language of your contracts.  We encourage you to read them closely.  Unglue.It cannot provide legal advice.<br /><br />
+If you believe you are a rights holder and would like to discuss ungluing your works, please contact us at <a href="mailto:rights@gluejar.com">rights@gluejar.com</a>.</dd>
+
 <dt>I know a book that should be unglued.</dt>
 
 <dd>Great! Find it in our database (using the search box above) and add it to your wishlist, so we know it should be on our list, too.  You can also contact us at <a href="mailto:rights@gluejar.com">rights@gluejar.com</a></dd>
@@ -450,7 +463,7 @@ We strongly encourage you to include video.  You can upload it to YouTube and em
 
 <dt>Will Unglue.It scan the books and produce ePub files?</dt>
 
-<dd>No. We will help you find third parties who will contract for conversion services. (TBA: is this true?)</dd>
+<dd>No. We will help you find third parties who will contract for conversion services.</dd>
 
 <dt>Will Unglue.It raise money to help pay for conversion costs?</dt>
 
@@ -482,7 +495,7 @@ Questions about the Unglue.it license
 
 <dt>What impact does ungluing a book have on the rights status of my other editions?</dt>
 
-<dd>The Creative Commons license is non-exclusive and will apply only to the unglued edition, not to the print, audio, or any other editions. It does not affect the rights status of those other editions.</dd>
+<dd>The Creative Commons license (CC BY-NC-ND) is non-exclusive and non-commercial.  It will apply only to the unglued edition, not to the print, audio, or any other editions. It does not affect the rights status of those other editions.</dd>
 
 <dt>Can an Unglued Ebook be issued only in the US?</dt>
 

frontend/templates/learn_more.html

@@ -19,8 +19,8 @@
                         <div class="user-block2">
                         <div class="block-inner">
                         	<label class="title">Spread the Word</label>
-                            <a href="https://www.facebook.com/sharer/sharer.php?src=bm&u={{request.build_absolute_uri}}"><img src="/static/images/supporter_icons/facebook_square.png" alt="Facebook" title="Facebook"  /></a>
+                            <a href="https://www.facebook.com/sharer/sharer.php?src=bm&u={{request.build_absolute_uri}}"><img src="/static/images/supporter_icons/facebook_square.png" class="spread_the_word" alt="Facebook" title="Facebook" /></a>
-                            <a href="https://twitter.com/share"><img src="/static/images/supporter_icons/twitter_square.png" alt="tweeter" title="Twitter"  /></a>
+                            <a href="https://twitter.com/share"><img src="/static/images/supporter_icons/twitter_square.png" alt="tweeter" title="Twitter" class="spread_the_word" /></a>
                         </div>
                         </div>
                     </div>

frontend/templates/press.html

@@ -42,12 +42,24 @@ For more background, read our president Eric Hellman's thoughts on <a href="http
 <dt>What does it cost?</dt>
 <dd>Unglue.It is free to join and explore.  Supporters pay only if they choose to support campaigns, and the amount is up to them.  Unglue.It takes a small percentage from successful campaigns, with the remainder going to the rights holders.</dd>
 <dt>What's your technology?</dt>
-<dd>Unglue.It is built using <a href="http://python.org/">Python</a> and the <a href="https://www.djangoproject.com/">Django framework</a>.  We use data from the <a href="http://code.google.com/apis/books/docs/v1/getting_started.html">Google Books</a>, <a href="http://openlibrary.org/developers/api">Open Library</a>, <a href="http://www.librarything.com/api">LibraryThing</a>, and <a href="http://www.goodreads.com/api">GoodReads</a> APIs [TBA: public?]; we appreciate that they've made these APIs available, and we're returning the favor with <a href="/api/help">our own API</a>.  You're welcome to use it.  We use <a href="http://lesscss.org/">Less</a> to organize our CSS.  We collaborate on our code at <a href="https://github.com/">GitHub</a> and deploy to the cloud with <a href="http://aws.amazon.com/ec2/">Amazon EC2</a>.</dd>
+<dd>Unglue.It is built using <a href="http://python.org/">Python</a> and the <a href="https://www.djangoproject.com/">Django framework</a>.  We use data from the <a href="http://code.google.com/apis/books/docs/v1/getting_started.html">Google Books</a>, <a href="http://openlibrary.org/developers/api">Open Library</a>, <a href="http://www.librarything.com/api">LibraryThing</a>, and <a href="http://www.goodreads.com/api">GoodReads</a> APIs; we appreciate that they've made these APIs available, and we're returning the favor with <a href="/api/help">our own API</a>.  You're welcome to use it.  We use <a href="http://lesscss.org/">Less</a> to organize our CSS.  We collaborate on our code at <a href="https://github.com/">GitHub</a> and deploy to the cloud with <a href="http://aws.amazon.com/ec2/">Amazon EC2</a>.</dd>
 <dt>I have more questions...</dt>
 <dd>Please consult our <a href="/faq/">FAQ</a> (sidebar at left); join the site and explore its features for yourself; or email us, <a href="press@gluejar.com">press@gluejar.com</a>.</dd>
 
 <a name="press"></a><h2>Press Coverage</h2>
 <div class="pressarticles">
+<div>
+	<a href="http://newsbreaks.infotoday.com/NewsBreaks/New-Crowdfunding-Initiative-to-Unglue-Ebooks-Launches-in-Alpha-80293.asp">New Crowdfunding Initiative to ‘Unglue’ Ebooks Launches in Alpha</a><br />
+	Information Today - January 30, 2012
+</div>
+<div>
+	<a href="http://publishingperspectives.com/2012/01/unglue-it-crowdfunds-unlimited-licenses-for-beloved-e-books/">Unglue.it Crowdfunds Unlimited Licenses for Beloved E-books</a><br />
+	Publishing Perspectives - January 23, 2012
+</div>
+<div>
+	<a href="http://www.thedigitalshift.com/2012/01/ebooks/gluejar-to-make-soft-launch-of-website-at-ala-midwinter/">Gluejar to Make Soft Launch of Website at ALA Midwinter</a><br />
+	The Digital Shift (Library Journal/School Library Journal) - January 16, 2012
+</div>
 <div>
 	<a href="http://publishingperspectives.com/2011/11/books-in-browsers-2011/">“Our Friends in Seattle” and Other Euphemisms from Books in Browsers 2011</a><br />
 	Publishing Perspectives - November 2, 2011
@@ -151,7 +163,6 @@ For more background, read our president Eric Hellman's thoughts on <a href="http
 
 {% comment %}
 should have logos at a variety of resolutions and also in greyscale
-should also have high-res screencaps
 {% endcomment %}
 </div>
 {% endblock %}

static/css/book_list.css

@@ -21,13 +21,15 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;

static/css/book_panel.css

@@ -21,13 +21,15 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;

static/css/campaign.css

@@ -21,13 +21,15 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;

static/css/documentation.css

@@ -21,15 +21,17 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;
@@ -75,15 +77,17 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;

static/css/landingpage.css

@@ -21,15 +21,17 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;
@@ -75,15 +77,17 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;
@@ -189,7 +193,6 @@
 }
 .user-block1 a.readon {
   float: left;
-  margin-top: 10px;
 }
 .user-block2 {
   color: #6994a3;
@@ -293,7 +296,7 @@
   width: 100%;
   display: block;
   clear: both;
-  padding-top: 10px;
+  padding: 10px 0 5px 16px;
 }
 .js-rightcol-padd {
   padding: 0;
@@ -522,7 +525,7 @@ h2.page-heading {
   font-weight: normal;
 }
 h3.module-title {
-  padding: 14px 0;
+  padding: 10px 0 0 0;
   font-size: 17px;
   font-weight: normal;
 }
@@ -531,26 +534,30 @@ h3.module-title {
   padding: 14px 0;
 }
 .google_signup div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .google_signup div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 #js-slideshow {
   padding: 0 30px;

static/css/learnmore.css

@@ -21,13 +21,15 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;

static/css/registration.css

@@ -21,13 +21,15 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;
@@ -132,13 +134,15 @@
   padding: 14px 0;
 }
 #login .google_signup div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 #login .google_signup img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbutton {
   width: auto;

static/css/sitewide.css

@@ -22,13 +22,15 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;
@@ -115,7 +117,7 @@ body {
   /* remove after alpha? */
 
   position: fixed;
-  top: 50%;
+  top: 30%;
   left: 0;
   z-index: 500;
 }
@@ -130,7 +132,7 @@ body {
   display: block;
   bottom: 0;
   width: 160px;
-  height: 26px;
+  height: 32px;
   -moz-border-radius: 32px;
   -webkit-border-radius: 32px;
   border-radius: 32px;
@@ -234,6 +236,12 @@ a.readon span {
   line-height: 36px;
   display: block;
 }
+.spread_the_word {
+  height: 24px;
+  width: 24px;
+  position: top;
+  margin-left: 5px;
+}
 /* Header section */
 #js-header {
   height: 90px;

static/css/supporter_layout.css

@@ -21,13 +21,15 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;
@@ -162,13 +164,13 @@ span.rounded > span:hover .hovertext {
   display: inline;
 }
 span.blue {
-  background: #a7d26a url("/static/images/header-button-blue.png") left bottom repeat-x;
+  background: #a7d26a url("/static/images/header-button-undefined.png") left bottom repeat-x;
 }
 span.orange {
-  background: #eabc7c url("/static/images/header-button-orange.png") left bottom repeat-x;
+  background: #eabc7c url("/static/images/header-button-undefined.png") left bottom repeat-x;
 }
 span.grey {
-  background: #bacfd6 url("/static/images/header-button-grey.png") left bottom repeat-x;
+  background: #bacfd6 url("/static/images/header-button-undefined.png") left bottom repeat-x;
 }
 div.check-list {
   float: left;

static/css/variables.css

@@ -21,13 +21,15 @@
   padding: 14px 0;
 }
 .google_signup_div div {
-  height: 32px;
+  height: 24px;
-  line-height: 32px;
+  line-height: 24px;
   float: left;
   padding-left: 5px;
 }
 .google_signup_div img {
   float: left;
+  height: 24px;
+  width: 24px;
 }
 .actionbuttons {
   width: auto;

static/less/landingpage.less

@@ -64,7 +64,6 @@
 	
 	a.readon { 
 		float: left; 
-		margin-top:10px;
 	}
 }
 
@@ -160,7 +159,7 @@
 		width:100%;
 		display:block;
 		clear:both;
-		padding-top:10px;
+		padding:10px 0 5px 16px;
 	}
 }
 
@@ -404,7 +403,7 @@ h2.page-heading {
 }
 
 h3.module-title {
-	padding: 14px 0;
+	padding: 10px 0 0 0;
 	font-size:17px;
 	font-weight: normal;
 }

static/less/sitewide.less

@@ -61,7 +61,7 @@ body{
 #feedback {
 	/* remove after alpha? */
 	position: fixed;
-	top: 50%;
+	top: 30%;
 	left: 0;
 	z-index:500;
 	
@@ -84,7 +84,7 @@ body{
 		display:block;
 		bottom:0;
 		width:160px;
-		height:26px;
+		height:32px;
 		.one-border-radius(32px);
 		background: @call-to-action;
 		margin-bottom: 0;
@@ -194,6 +194,12 @@ a.readon {
     }
 }
 
+.spread_the_word {
+	height: 24px;
+	width: 24px;
+	position: top;
+	margin-left:5px;
+}
 /* Header section */
 #js-header {
     height:90px;

static/less/variables.less

@@ -70,13 +70,15 @@
 	padding: 14px 0;
 	
 	div {
-		.height(32px);
+		.height(24px);
 		float: left;
 		padding-left:5px;
 	}
 	
 	img {
 		float: left;
+		height: 24px;
+		width:24px;
 	}
 }