9 files changed, 26 insertions, 12 deletions

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 23e51c7e..33dddf1e 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -307,6 +307,8 @@ class Poche
             $themes[$theme] = $this->getThemeInfo($theme);
         }
 
+        ksort($themes);
+
         return $themes;
     }
 
@@ -403,7 +405,7 @@ class Poche
     /**
      * Call action (mark as fav, archive, delete, etc.)
      */
-    public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE)
+    public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE, $tags = null)
     {
         switch ($action)
         {
@@ -499,8 +501,14 @@ class Poche
                 }
                 break;
             case 'add_tag' :
-                $tags = explode(',', $_POST['value']);
-                $entry_id = $_POST['entry_id'];
+                if($import){
+                    $entry_id = $id;
+                    $tags = explode(',', $tags);
+                }
+                else{
+                    $tags = explode(',', $_POST['value']);
+                    $entry_id = $_POST['entry_id'];
+                }
                 $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
                 if (!$entry) {
                     $this->messages->add('e', _('Article not found!'));
@@ -527,7 +535,9 @@ class Poche
                     # we assign the tag to the article
                     $this->store->setTagToEntry($tag_id, $entry_id);
                 }
-                Tools::redirect();
+                if(!$import) {
+                    Tools::redirect();
+                }
                 break;
             case 'remove_tag' :
                 $tag_id = $_GET['tag_id'];
@@ -889,14 +899,18 @@ class Poche
                 $a = $li->find('a');
                 $url = new Url(base64_encode($a[0]->href));
                 $this->action('add', $url, 0, TRUE);
+                $sequence = '';
+                if (STORAGE == 'postgres') {
+                    $sequence = 'entries_id_seq';
+                }
+                $last_id = $this->store->getLastId($sequence);
                 if ($read == '1') {
-                        $sequence = '';
-                        if (STORAGE == 'postgres') {
-                            $sequence = 'entries_id_seq';
-                        }
-                    $last_id = $this->store->getLastId($sequence);
                     $this->action('toggle_archive', $url, $last_id, TRUE);
                 }
+                $tags = $a[0]->tags;
+                if(!empty($tags)) {
+                    $this->action('add_tag',$url,$last_id,true,false,$tags);
+                }
             }
             
             # the second <ul> is for read links
diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css
index ec662158..7c02a16f 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/css/font.css
@@ -2,5 +2,5 @@
   font-family: 'PT Sans';
   font-style: normal;
   font-weight: 700;
-  src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff');
+  src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff');
 }
diff --git a/themes/baggy/font/icomoon.eot b/themes/baggy/fonts/icomoon.eot
index 02f53b36..02f53b36 100755
--- a/themes/baggy/font/icomoon.eot
+++ b/themes/baggy/fonts/icomoon.eot
diff --git a/themes/baggy/font/icomoon.svg b/themes/baggy/fonts/icomoon.svg
index d9c35b98..d9c35b98 100755
--- a/themes/baggy/font/icomoon.svg
+++ b/themes/baggy/fonts/icomoon.svg
diff --git a/themes/baggy/font/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf
index 3860dd04..3860dd04 100755
--- a/themes/baggy/font/icomoon.ttf
+++ b/themes/baggy/fonts/icomoon.ttf
diff --git a/themes/baggy/font/icomoon.woff b/themes/baggy/fonts/icomoon.woff
index c3a91ed7..c3a91ed7 100755
--- a/themes/baggy/font/icomoon.woff
+++ b/themes/baggy/fonts/icomoon.woff
diff --git a/themes/baggy/font/ptsans.woff b/themes/baggy/fonts/ptsans.woff
index cf7c62e1..cf7c62e1 100644
--- a/themes/baggy/font/ptsans.woff
+++ b/themes/baggy/fonts/ptsans.woff
diff --git a/themes/dmagenta/theme.ini b/themes/dmagenta/theme.ini
index 24ff3c4a..78fa3a9c 100644
--- a/themes/dmagenta/theme.ini
+++ b/themes/dmagenta/theme.ini
@@ -1,2 +1,2 @@
-name = Dark Magenta
+name = Dmagenta
 requirements[] = default
diff --git a/themes/solarized-dark/theme.ini b/themes/solarized-dark/theme.ini
index 7b6b341e..c9948146 100644
--- a/themes/solarized-dark/theme.ini
+++ b/themes/solarized-dark/theme.ini
@@ -1,2 +1,2 @@
-name = Dark Solarized
+name = Solarized Dark
 requirements[] = default