From 015effb244be30eeee34a61080216de1ec2e2625 Mon Sep 17 00:00:00 2001 From: Alex AUVOLAT Date: Wed, 11 Jul 2012 12:47:08 +0200 Subject: Minor usability & presentation changes. --- design/style.css | 7 +++---- lib/study/deck.php | 2 +- lib/study/setcard.php | 2 +- tpl/blog/index.php | 2 +- tpl/general/top.php | 11 ++++++----- tpl/study/deck.php | 2 +- tpl/study/index.php | 13 +++++++------ 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 '
' . filters_html_full() . '
'; foreach ($posts as $post) { echo '
'; - echo '
Written by ' . $post['owner']; + echo '
by ' . $post['owner']; if ($can_edit && $post['owner_id'] == $user['id']) echo ' | edit'; 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 'RegisterLogin'; } else { - echo 'My notebookLogout (' . $user['name'] . ')'; + echo 'Logout (' . $user['name'] . ')'; } ?>
@@ -33,13 +33,14 @@ if ($user['id'] == 0) { People My studies'; - echo 'Uploaded files'; + echo 'notes'; + echo 'files'; + echo 'studies'; } else { - echo 'Studies'; if ($user['priv'] >= $apps['file']['upload']) { - echo 'Upload file'; + echo 'upload file'; } + echo 'studies'; } ?>
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 '
' . filters_html_full() . '
'; if (count($study_cards) == 0) { - echo '

Nothing in this list at the moment.

'; + echo '
No cards in this view. Switch to another view to see more stuff.
'; } else { foreach($study_cards as $card) { echo '
'; 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 @@ -

Welcome to the My studies section. This is a simple study program, with two methods of studying available.

+

Welcome to the studies section. This is a simple study program, with two methods of studying available.

First method : cards

The first method is based on decks of cards, keeping track of your progress and everything.

-

Please take a look at the list of decks and start learning whatever you want to learn.

-

The cards you are studying are classified in the following boxes :

  • Skipped cards : cards you can't really say you know, but you don't want to study right now.
    • -
  • Levels 1 to 3 : you are reviewing these cards daily (or almost), in order to learn them.
    • +
  • Levels 1 to 3 : you are reviewing these cards frequently, in order to learn them.
  • Level 4 to 6 : we consider you know that card, and you are just reviewing it from times to times, making sure you didn't forget it.
  • Level 7 : you totally know that card and will never be asked about it again.
    • @@ -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.

    The load is calculated as a function of the number of cards with levels from 1 to 3 : it represents the quantity of stuff you are learning right now. When the load is smaller than the study rate you ask for, new cards will be suggested for - you to learn.

    + you to learn (if any are available in the deck).

    + +

    Please take a look at the list of decks and start learning whatever you want to learn. +You can also create your own decks, the editor is pretty intuitive.

    Second method : study lists

    In this method, we have lists of stuff to learn (like vocabulary), divided into batches (the batches are sorted -- cgit v1.2.3