- Update the locales

- Add the correct name when requestiong the bookmark
- Complete informations in about

app/models/item/Item.php

@@ -40,10 +40,6 @@ class Item extends ModlModel {
     }
     
     public function getName() {
-        /*if($this->name == '')
-            return $this->node;
-        else
-            return $this->name;*/
         if($this->name != null)
             return $this->name;
         elseif($this->node != null)

app/models/item/ItemDAO.php

@@ -136,8 +136,8 @@ class ItemDAO extends ModlSQL {
     }
     
     function getItem($server, $item) {
-        /*$this->_sql = '
-            select * from node
+        $this->_sql = '
+            select * from item
             where 
                 node = :node
                 and server = :server';
@@ -150,7 +150,6 @@ class ItemDAO extends ModlSQL {
             )
         );
         
-        return $this->run('Item', 'item');*/
-        return null;
+        return $this->run('Item', 'item');
     }
 }

app/models/subscription/Subscription.php

@@ -10,7 +10,7 @@ class Subscription extends ModlModel {
     public $subid;
     public $title;
     public $timestamp;
-    
+    public $name;
     
     public function __construct() {
         $this->_struct = '

app/models/subscription/SubscriptionDAO.php

@@ -70,9 +70,22 @@ class SubscriptionDAO extends ModlSQL {
     
     function getSubscribed() {
         $this->_sql = '
-            select jid, server, node, subscription from subscription
-            where jid = :jid
-            group by server, node, jid, subscription';
+            select 
+                subscription.jid, 
+                subscription.server, 
+                subscription.node, 
+                subscription, 
+                name
+            from subscription
+            left outer join item 
+                on item.server = subscription.server 
+                and item.node = subscription.node
+            where subscription.jid = :jid
+            group by 
+                subscription.server, 
+                subscription.node, 
+                subscription.jid, 
+                subscription, item.name';
         
         $this->prepare(
             'Subscription', 

app/widgets/About/about.tpl

@@ -88,4 +88,11 @@
        <dt>Icons</dt><dd>Famfamfam <a href="http://www.famfamfam.com/">www.famfamfam.com</a> under CC BY 3.0</dd>
        <dt></dt><dd>Icomoon <a href="http://keyamoon.com/">by Keyamoon</a> under CC BY 3.0</dd>
     </dl>
+
+    <h2>{$c->t('API')}</h2>
+    <dl>
+       <dt>OpenStreetMap</dt><dd>Nominatim <a href="http://nominatim.openstreetmap.org/">nominatim.openstreetmap.org</a></dd>
+       <dt>Last.fm API</dt><dd><a href="http://www.last.fm/api">www.last.fm/api</a></dd>
+       <dt>Youtube API</dt><dd><a href="http://developers.google.com/youtube">developers.google.com/youtube</a></dd>
+    </dl>
 </div>

app/widgets/Bookmark/Bookmark.php

@@ -225,11 +225,15 @@ class Bookmark extends WidgetBase
         if($sd != null && $sd->getSubscribed() != null) {
         
             foreach($sd->getSubscribed() as $s) {
+                if($s->name != null)
+                    $name = $s->name;
+                else
+                    $name = $s->node;
+                
                 $subscription .= '
                     <li>
-                        <a href="'.Route::urlize('node', array($s->server, $s->node)).'">
-                            <!--<span class="tag">'.$s->server.'</span>-->'.
-                            $s->node.' 
+                        <a href="'.Route::urlize('node', array($s->server, $s->node)).'">'.
+                            $name.' 
                         </a>
                     </li>';
                     

app/widgets/NodeConfig/NodeConfig.php

@@ -28,8 +28,17 @@ class NodeConfig extends WidgetBase
         $this->registerEvent('deletionsuccess', 'onGroupDeleted');
         
         if(isset($_GET['s']) && isset($_GET['n'])) {
+            $nd = new modl\ItemDAO();
+            $node = $nd->getItem($_GET['s'], $_GET['n']);
+            
+            if($node != null)
+                $title = $node->getName();
+            else
+                $title = $groupid;
+            
             $this->view->assign('server', $_GET['s']);
             $this->view->assign('node', $_GET['n']);
+            $this->view->assign('name', $title);
             $this->view->assign('group_config', $this->genCallAjax('ajaxGroupConfig', "'".$_GET['s']."'", "'".$_GET['n']."'"));
             $this->view->assign('group_delete', $this->genCallAjax('ajaxGroupDelete', "'".$_GET['s']."'", "'".$_GET['n']."'"));
         }

app/widgets/NodeConfig/nodeconfig.tpl

@@ -6,7 +6,7 @@
         {$server}
     </a>
     <a href="{$c->route('node', array($server, $node))}">
-        {$node}
+        {$name}
     </a>
     <a>{$c->t('Configuration')}</a>
 </div>

system/Logs/Logger.php

@@ -89,7 +89,8 @@ abstract class Logger
                         font-family: monospace;
                     }
                     .dev {
-                        padding: 1em;
+                        padding: 0.5em;
+                        padding-top: 0.2em;
                         background-color: yellow;
                         display: block;
                         clear:both;
@@ -110,7 +111,6 @@ abstract class Logger
                                             transparent 75%, transparent);
 
                         pointer-events: none;
-                        opacity: 0.7;
                     }
                 </style>';
                 self::$cssOutputDone=true;
@@ -166,12 +166,13 @@ abstract class Logger
             if (!self::$warningDevelopmentModeDisplayed) {
                 if (ENVIRONMENT === 'development') {
                     if (function_exists('t')) {
-                        print '<div class="dev">
-                            <p>'.t('Development environment.').'</p>
-                            <p>'.t('Change it in the admin panel.').'</p>
+                        print '
+                        <div class="dev">
+                            <p>'.t('Development environment.').' - '.t('Change it in the admin panel.').'</p>
                         </div>';
                     } else {
-                        print '<div class="dev">
+                        print '
+                        <div class="dev">
                             <p>Be careful you are currently in development environment</p>
                         </div>';
                     }