Minor usability & presentation changes.

7 files changed, 20 insertions, 19 deletions

diff --git a/design/style.css b/design/style.css
index 613fed7..19cacc1 100644
--- a/design/style.css
+++ b/design/style.css
@@ -52,10 +52,9 @@ h1 {
 	}
 
 	.menu a {
-		min-width: 100px;
 		padding: 4px;
-		padding-left: 20px;
-		padding-right: 20px;
+		padding-left: 25px;
+		padding-right: 25px;
 	}
 }
 
@@ -155,7 +154,7 @@ iframe, textarea {
   padding: 8px;
   border: 1px solid #CFC;
   background-color: #E7FFE7;
-  color: #2A2;
+  color: #060;
 }
 
 .tree_branch {
diff --git a/lib/study/deck.php b/lib/study/deck.php
index 99119ef..752ff98 100644
--- a/lib/study/deck.php
+++ b/lib/study/deck.php
@@ -78,7 +78,7 @@ $filters = array(
 	"way" => $ord_ways,
 );
 $fdefaults = array(
-	"what" => "level > 0 AND level < 4",
+	"what" => "level > 0 AND next_review <= CURDATE()",
 	"order" => "level",
 	"way" => "ASC",
 );
diff --git a/lib/study/setcard.php b/lib/study/setcard.php
index 13f3fc0..c71bbfe 100644
--- a/lib/study/setcard.php
+++ b/lib/study/setcard.php
@@ -22,7 +22,7 @@ assert_error($info['cardnumber'] <= $info['last_card'] + 1, "You must first add
 
 $level = intval($args[3]);
 assert_error($level >= 0 && $level <= 7, "That level is invalid.");
-$intervals = array(999999, 1, 3, 5, 8, 16, 24, 999999);
+$intervals = array(999999, 1, 2, 4, 8, 16, 32, 999999);
 
 if ($info['cardnumber'] == $info['last_card'] + 1) {
 	sql("INSERT INTO card_study(deck_study, card, level, next_review) ".
diff --git a/tpl/blog/index.php b/tpl/blog/index.php
index c04b4c0..cd458c1 100644
--- a/tpl/blog/index.php
+++ b/tpl/blog/index.php
@@ -12,7 +12,7 @@ echo '<div class="ordering_links">' . filters_html_full() . '</div>';
 
 foreach ($posts as $post) {
 	echo '<div class="blog_post">';
-	echo '<div class="small_right">Written by ' . $post['owner'];
+	echo '<div class="small_right">by ' . $post['owner'];
 	if ($can_edit && $post['owner_id'] == $user['id'])
 		echo ' | <a href="edit-blog-' . $post['id'] . '">edit</a>';
 	if ($can_delete && $post['owner_id'] == $user['id'])
diff --git a/tpl/general/top.php b/tpl/general/top.php
index e2b168a..2eb0862 100644
--- a/tpl/general/top.php
+++ b/tpl/general/top.php
@@ -24,7 +24,7 @@ global $user, $apps;	//These might be hidden because this page is called from sq
 if ($user['id'] == 0) {
 	echo '<a href="new-account">Register</a><a href="?login">Login</a>';
 } else {
-	echo '<a href="user-notes-' . $user['id'] . '">My notebook</a><a href="?logout">Logout (' . $user['name'] . ')</a>';
+	echo '<a href="?logout">Logout (' . $user['name'] . ')</a>';
 }
 ?>
 			</div>
@@ -33,13 +33,14 @@ if ($user['id'] == 0) {
 				<a href="list-account">People</a>
 			<?php
 if ($user['id'] != 0) {
-	echo '<a href="study">My studies</a>';
-	echo '<a href="file">Uploaded files</a>';
+	echo '<a href="user-notes-' . $user['id'] . '">notes</a>';
+	echo '<a href="file">files</a>';
+	echo '<a href="study">studies</a>';
 } else {
-	echo '<a href="study">Studies</a>';
 	if ($user['priv'] >= $apps['file']['upload']) {
-		echo '<a href="upload-file">Upload file</a>';
+		echo '<a href="upload-file">upload file</a>';
 	}
+	echo '<a href="study">studies</a>';
 }
 ?>
 			</div>
diff --git a/tpl/study/deck.php b/tpl/study/deck.php
index 9209845..42ef784 100644
--- a/tpl/study/deck.php
+++ b/tpl/study/deck.php
@@ -26,7 +26,7 @@ if (isset($next_card)) {
 echo '<div class="ordering_links">' . filters_html_full() . '</div>';
 
 if (count($study_cards) == 0) {
-	echo '<p>Nothing in this list at the moment.</p>';
+	echo '<br /><div class="message">No cards in this view. Switch to another view to see more stuff.</div>';
 } else {
 	foreach($study_cards as $card) {
 		echo '<div class="study_card scb'.$card['level'].'">';
diff --git a/tpl/study/index.php b/tpl/study/index.php
index 287be11..83899e7 100644
--- a/tpl/study/index.php
+++ b/tpl/study/index.php
@@ -1,22 +1,20 @@
 <?php
 
-$title = "My studies";
+$title = "Studies";
 require("tpl/general/top.php");
 
 ?>
 
-<p>Welcome to the <em>My studies</em> section. This is a simple study program, with two methods of studying available.</p>
+<p>Welcome to the <em>studies</em> section. This is a simple study program, with two methods of studying available.</p>
 
 <h3>First method : cards</h3>
 <p>The first method is based on
 decks of cards, keeping track of your progress and everything.</p>
 
-<p>Please take a look at the <a href="deck">list of decks</a> and start learning whatever you want to learn.</p>
-
 <p>The cards you are studying are classified in the following <em>boxes</em> :</p>
 <ul>
 <li><strong>Skipped cards :</strong> cards you can't really say you know, but you don't want to study right now.</li>
-<li><strong>Levels 1 to 3 :</strong> you are reviewing these cards daily (or almost), in order to <em>learn</em> them.</li>
+<li><strong>Levels 1 to 3 :</strong> you are reviewing these cards frequently, in order to <em>learn</em> them.</li>
 <li><strong>Level 4 to 6 :</strong> we consider you <em>know</em> that card, and you are just reviewing it from times to times,
   making sure you didn't forget it.</li>
 <li><strong>Level 7 :</strong> you totally know that card and will never be asked about it again.</li>
@@ -27,7 +25,10 @@ Cards you are supposed to study or review today appear with a bold title : that
   you should decide to put it either in the next box, or somewhere else.</p>
 <p>The <em>load</em> is calculated as a function of the number of cards with levels from 1 to 3 : it represents the quantity of
   stuff you are <em>learning</em> right now. When the load is smaller than the study rate you ask for, new cards will be suggested for
-  you to learn.</p>
+  you to learn (if any are available in the deck).</p>
+
+<p>Please take a look at the <a href="deck">list of decks</a> and start learning whatever you want to learn.
+You can also create your own decks, the editor is pretty intuitive.</p>
 
 <h3>Second method : study lists</h3>
 <p>In this method, we have lists of stuff to learn (like vocabulary), divided into batches (the batches are sorted