diff --git a/view/admin/blog/list.html.php b/view/admin/blog/list.html.php
index 5b26807a..1ca27ccd 100644
--- a/view/admin/blog/list.html.php
+++ b/view/admin/blog/list.html.php
@@ -21,47 +21,128 @@
 use Goteo\Library\Text,
     Goteo\Core\ACL;
 
+// paginacion
+require_once 'library/pagination/pagination.php';
+
 $translator = ACL::check('/translate') ? true : false;
+
+$filters = $this['filters'];
+if (empty($filters['show'])) $filters['show'] = 'all';
+$the_filters = '';
+foreach ($filters as $key=>$value) {
+    $the_filters .= "&{$key}={$value}";
+}
+
+$pagedResults = new \Paginated($this['posts'], 10, isset($_GET['page']) ? $_GET['page'] : 1);
 ?>
-<a href="/admin/blog/add" class="button red"><?php echo Text::_("Nueva entrada"); ?></a>
+<a href="/admin/blog/add" class="button"><?php echo Text::_("Nueva entrada"); ?></a>
+&nbsp;&nbsp;&nbsp;
+<a href="/admin/blog/reorder" class="button">Ordenar la portada</a>
+
+<div class="widget board">
+    <form id="filter-form" action="/admin/blog" method="get">
+        <div style="float:left;margin:5px;">
+            <label for="show-filter">Mostrar:</label><br />
+            <select id="show-filter" name="show" onchange="document.getElementById('filter-form').submit();">
+            <?php foreach ($this['show'] as $itemId=>$itemName) : ?>
+                <option value="<?php echo $itemId; ?>"<?php if ($filters['show'] == $itemId) echo ' selected="selected"';?>><?php echo $itemName; ?></option>
+            <?php endforeach; ?>
+            </select>
+        </div>
+
+        <?php if ($filters['show'] == 'updates') : ?>
+        <div style="float:left;margin:5px;">
+            <label for="blog-filter">Del proyecto:</label><br />
+            <select id="blog-filter" name="blog" onchange="document.getElementById('filter-form').submit();">
+                <option value="">Cualquiera</option>
+            <?php foreach ($this['blogs'] as $itemId=>$itemName) : ?>
+                <option value="<?php echo $itemId; ?>"<?php if ($filters['blog'] == $itemId) echo ' selected="selected"';?>><?php echo $itemName; ?></option>
+            <?php endforeach; ?>
+            </select>
+        </div>
+        <?php endif; ?>
+
+        <?php if ($filters['show'] == 'entries') : ?>
+        <div style="float:left;margin:5px;">
+            <label for="blog-filter">Del nodo:</label><br />
+            <select id="blog-filter" name="blog" onchange="document.getElementById('filter-form').submit();">
+                <option value="">Cualquiera</option>
+            <?php foreach ($this['blogs'] as $itemId=>$itemName) : ?>
+                <option value="<?php echo $itemId; ?>"<?php if ($filters['blog'] == $itemId) echo ' selected="selected"';?>><?php echo $itemName; ?></option>
+            <?php endforeach; ?>
+            </select>
+        </div>
+        <?php endif; ?>
+    </form>
+</div>
 
 <div class="widget board">
     <?php if (!empty($this['posts'])) : ?>
     <table>
         <thead>
             <tr>
-                <td><!-- <?php echo Text::_("Edit"); ?> --></td>
-                <th><?php echo Text::_("Título"); ?></th> <!-- title -->
+                <th><!-- published --></th>
+                <th colspan="6"><?php echo Text::_("Título"); ?></th> <!-- title -->
                 <th><?php echo Text::_("Fecha"); ?></th> <!-- date -->
-                <th><?php echo Text::_("Publicado"); ?></th>
-                <th><?php echo Text::_("En portada"); ?></th>
-                <th><?php echo Text::_("Al pie"); ?></th>
-                <th><!-- <?php echo Text::_("Traducir"); ?>--></th>
-                <td><!-- <?php echo Text::_("Remove"); ?> --></td>
-                <td></td><!-- preview -->
+                <th>Autor</th>
             </tr>
         </thead>
 
         <tbody>
-            <?php foreach ($this['posts'] as $post) : ?>
+            <?php while ($post = $pagedResults->fetchPagedRow()) : ?>
             <tr>
-                <td><a href="/admin/blog/edit/<?php echo $post->id; ?>">[<?php echo Text::_("Editar"); ?>]</a></td>
-                <td><?php echo $post->title; ?></td>
-                <td><?php echo $post->date; ?></td>
-                <td><?php echo $post->publish ? Text::_("Sí") : ''; ?></td>
-                <td><?php echo $post->home ? Text::_("Sí") : ''; ?></td>
-                <td><?php echo $post->footer ? Text::_("Sí") : ''; ?></td>
-                <?php if ($translator) : ?>
-                <td><a href="/translate/post/edit/<?php echo $post->id; ?>" >[<?php echo Text::_("Traducir"); ?>]</a></td>
-                <?php endif; ?>
-                <td><a href="/admin/blog/remove/<?php echo $post->id; ?>" onclick="return confirm('<?php echo Text::_("Seguro que deseas eliminar este registro?"); ?>');">[<?php echo Text::_("Quitar"); ?>]</a></td>
-                <td><a href="/blog/<?php echo $post->id; ?>?preview=<?php echo $_SESSION['user']->id ?>" target="_blank">[<?php echo Text::_("Ver publicado"); ?>]</a></td>
+                <td><?php if ($post->publish) echo '<strong style="color:#20b2b3;font-size:10px;">Publicada</sttrong>'; ?></td>
+                <td colspan="6"><?php
+                        $style = '';
+                        if (isset($this['homes'][$post->id]))
+                            $style .= ' font-weight:bold;';
+                        if (empty($_SESSION['admin_node']) || $_SESSION['admin_node'] == \GOTEO_NODE) {
+                            if (isset($this['footers'][$post->id]))
+                                $style .= ' font-style:italic;';
+                        }
+                            
+                      echo "<span style=\"{$style}\">{$post->title}</span>";
+                ?></td>
+                <td><?php echo $post->fecha; ?></td>
+                <td><?php echo $post->user->name . ' (' . $post->owner_name . ')'; ?></td>
             </tr>
-            <?php endforeach; ?>
+            <tr>
+                <td><a href="/blog/<?php echo $post->id; ?>?preview=<?php echo $_SESSION['user']->id ?>" target="_blank">[Ver]</a></td>
+                <td><?php if (($post->owner_type == 'node' && $post->owner_id == $node) || $node == \GOTEO_NODE) : ?>
+                    <a href="/admin/blog/edit/<?php echo $post->id; ?>">[Editar]</a>
+                <?php endif; ?></td>
+                <td><?php if (isset($this['homes'][$post->id])) {
+                        echo '<a href="/admin/blog/remove_home/'.$post->id.'" style="color:red;">[Quitar de portada]</a>';
+                    } elseif ($post->publish) {
+                        echo '<a href="/admin/blog/add_home/'.$post->id.'" style="color:blue;">[Poner en portada]</a>';
+                    } ?></td>
+                <td><?php if (empty($_SESSION['admin_node']) || $_SESSION['admin_node'] == \GOTEO_NODE) {
+                        if (isset($this['footers'][$post->id])) {
+                            echo '<a href="/admin/blog/remove_footer/'.$post->id.'" style="color:red;">[Quitar del footer]</a>';
+                        } elseif ($post->publish) {
+                            echo '<a href="/admin/blog/add_footer/'.$post->id.'" style="color:blue;">[Poner en footer]</a>';
+                        }
+                    } ?></td>
+                <td>
+                <?php if ($translator && $node == \GOTEO_NODE) : ?><a href="/translate/post/edit/<?php echo $post->id; ?>" >[Traducir]</a><?php endif; ?>
+                <?php if ($node != \GOTEO_NODE && $transNode && ($post->owner_type == 'node' && $post->owner_id == $node)) : ?><a href="/translate/node/<?php echo $node ?>/post/edit/<?php echo $post->id; ?>" target="_blank">[Traducir]</a><?php endif; ?>
+                </td>
+                <td><?php if (!$post->publish && (($post->owner_type == 'node' && $post->owner_id == $_SESSION['admin_node']) || !isset($_SESSION['admin_node']))) : ?>
+                    <a href="/admin/blog/remove/<?php echo $post->id; ?>" onclick="return confirm('Seguro que deseas eliminar este registro?');">[Eliminar]</a>
+                <?php endif; ?></td>
+                <td></td>
+            </tr>
+            <tr>
+                <td colspan="9"><hr /></td>
+            </tr>
+            <?php endwhile; ?>
         </tbody>
-
     </table>
-    <?php else : ?>
-    <p><?php echo Text::_("No se han encontrado registros"); ?></p>
-    <?php endif; ?>
-</div>
\ No newline at end of file
+</div>
+<ul id="pagination" style="margin-bottom: 10px; padding-left: 150px;">
+<?php   $pagedResults->setLayout(new DoubleBarLayout());
+        echo $pagedResults->fetchPagedNavigation(str_replace('?', '&', $the_filters)); ?>
+</ul>
+<?php else : ?>
+<p>No se han encontrado registros</p>
+<?php endif; ?>
diff --git a/view/admin/criteria/edit.html.php b/view/admin/criteria/edit.html.php
index d4ee8d2c..3e50bbfe 100644
--- a/view/admin/criteria/edit.html.php
+++ b/view/admin/criteria/edit.html.php
@@ -36,7 +36,7 @@
 </script>
 
 <div class="widget board">
-    <form method="post" action="/admin/criteria/?filter=<?php echo $this['filter']; ?>">
+    <form method="post" action="/admin/criteria">
 
         <input type="hidden" name="action" value="<?php echo $this['action']; ?>" />
         <input type="hidden" name="id" value="<?php echo $this['criteria']->id; ?>" />
diff --git a/view/admin/criteria/list.html.php b/view/admin/criteria/list.html.php
index 6bad0c07..36f0206f 100644
--- a/view/admin/criteria/list.html.php
+++ b/view/admin/criteria/list.html.php
@@ -22,15 +22,16 @@
     Goteo\Core\ACL;
 
 $translator = ACL::check('/translate') ? true : false;
+$filters = $this['filters'];
 ?>
-<a href="/admin/criteria/add/?filter=<?php echo $this['filter']; ?>" class="button red"><?php echo Text::_('Añadir criterio'); ?></a>
+<a href="/admin/criteria/add" class="button"><?php echo Text::_('Añadir criterio'); ?></a>
 
 <div class="widget board">
     <form id="sectionfilter-form" action="/admin/criteria" method="get">
         <label for="section-filter"><?php echo Text::_('Mostrar los criterios de la sección:'); ?></label>
-        <select id="section-filter" name="filter" onchange="document.getElementById('sectionfilter-form').submit();">
+        <select id="section-filter" name="section" onchange="document.getElementById('sectionfilter-form').submit();">
         <?php foreach ($this['sections'] as $sectionId=>$sectionName) : ?>
-            <option value="<?php echo $sectionId; ?>"<?php if ($this['filter'] == $sectionId) echo ' selected="selected"';?>><?php echo $sectionName; ?></option>
+            <option value="<?php echo $sectionId; ?>"<?php if ($filters['section'] == $sectionId) echo ' selected="selected"';?>><?php echo $sectionName; ?></option>
         <?php endforeach; ?>
         </select>
     </form>
@@ -54,15 +55,15 @@
         <tbody>
             <?php foreach ($this['criterias'] as $criteria) : ?>
             <tr>
-                <td><a href="/admin/criteria/edit/<?php echo $criteria->id; ?>/?filter=<?php echo $this['filter']; ?>">[Editar]</a></td>
+                <td><a href="/admin/criteria/edit/<?php echo $criteria->id; ?>">[Editar]</a></td>
                 <td><?php echo $criteria->title; ?></td>
                 <td><?php echo $criteria->order; ?></td>
-                <td><a href="/admin/criteria/up/<?php echo $criteria->id; ?>/?filter=<?php echo $this['filter']; ?>">[&uarr;]</a></td>
-                <td><a href="/admin/criteria/down/<?php echo $criteria->id; ?>/?filter=<?php echo $this['filter']; ?>">[&darr;]</a></td>
+                <td><a href="/admin/criteria/up/<?php echo $criteria->id; ?>">[&uarr;]</a></td>
+                <td><a href="/admin/criteria/down/<?php echo $criteria->id; ?>">[&darr;]</a></td>
                 <?php if ($translator) : ?>
                 <td><a href="/translate/criteria/edit/<?php echo $criteria->id; ?>" >[Traducir]</a></td>
                 <?php endif; ?>
-                <td><a href="/admin/criteria/remove/<?php echo $criteria->id; ?>/?filter=<?php echo $this['filter']; ?>" onclick="return confirm('Seguro que deseas eliminar este registro?');">[Quitar]</a></td>
+                <td><a href="/admin/criteria/remove/<?php echo $criteria->id; ?>" onclick="return confirm('Seguro que deseas eliminar este registro?');">[Quitar]</a></td>
             </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/view/admin/faq/edit.html.php b/view/admin/faq/edit.html.php
index 71930200..55486078 100644
--- a/view/admin/faq/edit.html.php
+++ b/view/admin/faq/edit.html.php
@@ -35,7 +35,7 @@
 });
 </script>
 <div class="widget board">
-    <form method="post" action="/admin/faq/?filter=<?php echo $this['filter']; ?>">
+    <form method="post" action="/admin/faq">
 
         <input type="hidden" name="action" value="<?php echo $this['action']; ?>" />
         <input type="hidden" name="id" value="<?php echo $this['faq']->id; ?>" />
diff --git a/view/admin/faq/list.html.php b/view/admin/faq/list.html.php
index 36d233f8..4f5b0baf 100644
--- a/view/admin/faq/list.html.php
+++ b/view/admin/faq/list.html.php
@@ -22,15 +22,16 @@
     Goteo\Core\ACL;
 
 $translator = ACL::check('/translate') ? true : false;
+$filters = $this['filters'];
 ?>
-<a href="/admin/faq/add/?filter=<?php echo $this['filter']; ?>" class="button red"><?php echo("Añadir pregunta");?></a>
+<a href="/admin/faq/add/?filter=" class="button red"><?php echo Text::_("Añadir pregunta");?></a>
 
 <div class="widget board">
     <form id="sectionfilter-form" action="/admin/faq" method="get">
-        <label for="section-filter"><?php echo("Mostrar las preguntas de:");?></label>
-        <select id="section-filter" name="filter" onchange="document.getElementById('sectionfilter-form').submit();">
+        <label for="section-filter"><?php echo Text::_("Mostrar las preguntas de:");?></label>
+        <select id="section-filter" name="section" onchange="document.getElementById('sectionfilter-form').submit();">
         <?php foreach ($this['sections'] as $sectionId=>$sectionName) : ?>
-            <option value="<?php echo $sectionId; ?>"<?php if ($this['filter'] == $sectionId) echo ' selected="selected"';?>><?php echo $sectionName; ?></option>
+            <option value="<?php echo $sectionId; ?>"<?php if ($filters['section'] == $sectionId) echo ' selected="selected"';?>><?php echo $sectionName; ?></option>
         <?php endforeach; ?>
         </select>
     </form>
@@ -42,8 +43,8 @@
         <thead>
             <tr>
                 <td><!-- Edit --></td>
-                <th><?php echo("Título");?></th> <!-- title -->
-                <th><?php echo("Posición");?></th> <!-- order -->
+                <th><?php echo Text::_("Título");?></th> <!-- title -->
+                <th><?php echo Text::_("Posición");?></th> <!-- order -->
                 <td><!-- Move up --></td>
                 <td><!-- Move down --></td>
                 <td><!-- Traducir--></td>
@@ -54,15 +55,15 @@
         <tbody>
             <?php foreach ($this['faqs'] as $faq) : ?>
             <tr>
-                <td><a href="/admin/faq/edit/<?php echo $faq->id; ?>/?filter=<?php echo $this['filter']; ?>">[Editar]</a></td>
+                <td><a href="/admin/faq/edit/<?php echo $faq->id; ?>">[Editar]</a></td>
                 <td><?php echo $faq->title; ?></td>
                 <td><?php echo $faq->order; ?></td>
-                <td><a href="/admin/faq/up/<?php echo $faq->id; ?>/?filter=<?php echo $this['filter']; ?>">[&uarr;]</a></td>
-                <td><a href="/admin/faq/down/<?php echo $faq->id; ?>/?filter=<?php echo $this['filter']; ?>">[&darr;]</a></td>
+                <td><a href="/admin/faq/up/<?php echo $faq->id; ?>">[&uarr;]</a></td>
+                <td><a href="/admin/faq/down/<?php echo $faq->id; ?>">[&darr;]</a></td>
                 <?php if ($translator) : ?>
                 <td><a href="/translate/faq/edit/<?php echo $faq->id; ?>" >[Traducir]</a></td>
                 <?php endif; ?>
-                <td><a href="/admin/faq/remove/<?php echo $faq->id; ?>/?filter=<?php echo $this['filter']; ?>" onclick="return confirm('Seguro que deseas eliminar este registro?');">[Quitar]</a></td>
+                <td><a href="/admin/faq/remove/<?php echo $faq->id; ?>" onclick="return confirm('Seguro que deseas eliminar este registro?');">[Quitar]</a></td>
             </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/view/admin/glossary/edit.html.php b/view/admin/glossary/edit.html.php
index 96b4b901..843bc2c6 100644
--- a/view/admin/glossary/edit.html.php
+++ b/view/admin/glossary/edit.html.php
@@ -18,13 +18,10 @@
  *
  */
 
-
 use Goteo\Library\Text,
     Goteo\Model,
     Goteo\Core\Redirection,
-    Goteo\Library\SuperForm;
-
-define('ADMIN_NOAUTOSAVE', true);
+    Goteo\Library\NormalForm;
 
 $post = $this['post'];
 
@@ -32,19 +29,17 @@
     throw new Redirection('/admin/glossary');
 }
 
-// Superform
-    $images = array();
-    foreach ($post->gallery as $image) {
-        $images[] = array(
-            'type'  => 'html',
-            'class' => 'inline gallery-image',
-            'html'  => is_object($image) ?
+$images = array();
+foreach ($post->gallery as $image) {
+    $images[] = array(
+        'type'  => 'html',
+        'class' => 'inline gallery-image',
+        'html'  => is_object($image) ?
                        $image . '<img src="'.SRC_URL.'/image/'.$image->id.'/128/128" alt="'.Text::_("Imagen").'" /><button class="image-remove weak" type="submit" name="gallery-'.$image->id.'-remove" title="'.Text::_("Quitar imagen").'" value="'.Text::_("remove").'"></button>' :
-                       ''
-        );
-
-    }
+                   ''
+    );
 
+}
 ?>
 <script type="text/javascript" src="/view/js/ckeditor/ckeditor.js"></script>
 <script type="text/javascript">
@@ -71,9 +66,9 @@
 });
 </script>
 
-<form method="post" action="/admin/glossary/<?php echo $this['action']; ?>/<?php echo $post->id; ?>" class="project" enctype="multipart/form-data">
+<form method="post" action="/admin/glossary/<?php echo $this['action']; ?>/<?php echo $post->id; ?>" enctype="multipart/form-data">
 
-    <?php echo new SuperForm(array(
+    <?php echo new NormalForm(array(
 
         'action'        => '',
         'level'         => 3,
@@ -96,14 +91,12 @@
             ),
             'title' => array(
                 'type'      => 'textbox',
-                'required'  => true,
                 'size'      => 20,
                 'title'     => Text::_("Término"),
                 'value'     => $post->title,
             ),
             'text' => array(
                 'type'      => 'textarea',
-                'required'  => true,
                 'cols'      => 40,
                 'rows'      => 4,
                 'title'     => Text::_("Explicación del término"),
diff --git a/view/admin/glossary/list.html.php b/view/admin/glossary/list.html.php
index bc522d62..5024d51c 100644
--- a/view/admin/glossary/list.html.php
+++ b/view/admin/glossary/list.html.php
@@ -23,7 +23,7 @@
 
 $translator = ACL::check('/translate') ? true : false;
 ?>
-<a href="/admin/glossary/add" class="button red"><?php echo Text::_("Nuevo término"); ?></a>
+<a href="/admin/glossary/add" class="button"><?php echo Text::_("Nuevo término"); ?></a>
 
 <div class="widget board">
     <?php if (!empty($this['posts'])) : ?>
diff --git a/view/admin/icons/edit.html.php b/view/admin/icons/edit.html.php
index 35c7b068..3036e08e 100644
--- a/view/admin/icons/edit.html.php
+++ b/view/admin/icons/edit.html.php
@@ -23,7 +23,7 @@
 ?>
 <div class="widget board">
     <!-- super form -->
-    <form method="post" action="/admin/icons?filter=<?php echo $this['filter']; ?>">
+    <form method="post" action="/admin/icons">
 
         <input type="hidden" name="action" value="<?php echo $this['action']; ?>" />
         <input type="hidden" name="id" value="<?php echo $this['icon']->id; ?>" />
diff --git a/view/admin/icons/list.html.php b/view/admin/icons/list.html.php
index 18082017..61582bd8 100644
--- a/view/admin/icons/list.html.php
+++ b/view/admin/icons/list.html.php
@@ -22,16 +22,15 @@
     Goteo\Core\ACL;
 
 $translator = ACL::check('/translate') ? true : false;
+$filters = $this['filters'];
 ?>
-<!-- <a href="/admin/icons/add/?filter=<?php echo $this['filter']; ?>" class="button red">Añadir tipo</a> -->
-
 <div class="widget board">
     <form id="groupfilter-form" action="/admin/icons" method="get">
         <label for="group-filter"> <?php echo Text::_("Mostrar los tipos para:"); ?></label>
-        <select id="group-filter" name="filter" onchange="document.getElementById('groupfilter-form').submit();">
+        <select id="group-filter" name="group" onchange="document.getElementById('groupfilter-form').submit();">
             <option value=""><?php echo Text::_("Todo"); ?></option>
         <?php foreach ($this['groups'] as $groupId=>$groupName) : ?>
-            <option value="<?php echo $groupId; ?>"<?php if ($this['filter'] == $groupId) echo ' selected="selected"';?>><?php echo $groupName; ?></option>
+            <option value="<?php echo $groupId; ?>"<?php if ($filters['group'] == $groupId) echo ' selected="selected"';?>><?php echo $groupName; ?></option>
         <?php endforeach; ?>
         </select>
     </form>
@@ -54,14 +53,13 @@
         <tbody>
             <?php foreach ($this['icons'] as $icon) : ?>
             <tr>
-                <td><a href="/admin/icons/edit/<?php echo $icon->id; ?>/?filter=<?php echo $this['filter']; ?>"><?php echo Text::_("[Editar]"); ?></a></td>
+                <td><a href="/admin/icons/edit/<?php echo $icon->id; ?>"><?php echo Text::_("[Editar]"); ?></a></td>
                 <td><?php echo $icon->name; ?></td>
                 <td><?php echo $icon->description; ?></td>
                 <td><?php echo !empty($icon->group) ? $this['groups'][$icon->group] : Text::_('Ambas'); ?></td>
                 <?php if ($translator) : ?>
                 <td><a href="/translate/icon/edit/<?php echo $icon->id; ?>" ><?php echo Text::_("[Traducir]"); ?></a></td>
                 <?php endif; ?>
-                <!-- <td><a href="/admin/icons/remove/<?php echo $icon->id; ?>/?filter=<?php echo $this['filter']; ?>" onclick="return confirm('Seguro que deseas eliminar este registro?');">[Quitar]</a></td> -->
             </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/view/admin/invests/details.html.php b/view/admin/invests/details.html.php
index 597d4893..513a8961 100644
--- a/view/admin/invests/details.html.php
+++ b/view/admin/invests/details.html.php
@@ -26,6 +26,9 @@
 $campaign = $this['campaign'];
 $user = $this['user'];
 
+$rewards = $invest->rewards;
+array_walk($rewards, function (&$reward) { $reward = $reward->reward; });
+
 ?>
 <div class="widget">
     <p>
@@ -111,7 +114,7 @@ class="button red"><?php echo Text::_("Ejecutar cargo ahora"); ?></a>
     <dl>
         <dt><?php echo Text::_("Recompensas elegidas:"); ?></dt>
         <dd>
-            <?php echo implode(', ', $investData->rewards); ?>
+            <?php echo implode(', ', $rewards); ?>
         </dd>
     </dl>
     <?php endif; ?>
diff --git a/view/admin/invests/list.html.php b/view/admin/invests/list.html.php
index 7d374f7b..5b8f3a83 100644
--- a/view/admin/invests/list.html.php
+++ b/view/admin/invests/list.html.php
@@ -18,7 +18,8 @@
  *
  */
 
-use Goteo\Library\Text;
+use Goteo\Library\Text,
+    Goteo\Model\Invest;
 
 $filters = $this['filters'];
 
@@ -47,12 +48,6 @@
         'label' =>  Text::_("Extra"),
         'first' =>  Text::_("Todos"))
 ); ?>
-<a href="/admin/invests/add" class="button red"><?php echo Text::_("Generar aportes manuales"); ?></a>
-<?php if (!empty($filters['projects'])) : ?>
-    <br />
-    <a href="/admin/invests/report/<?php echo $filters['projects'] ?>" class="button red" target="_blank"><?php echo Text::_("Informe financiero de "); ?><?php echo $this['projects'][$filters['projects']] ?></a>&nbsp;&nbsp;&nbsp;
-    <a href="/cron/dopay/<?php echo $filters['projects'] ?>" target="_blank" class="button red" onclick="return confirm(Text::_("No hay vuelta atrás, ok?"));"><?php echo Text::_("Realizar pagos secundarios a "); ?><?php echo $this['projects'][$filters['projects']] ?></a>
-<?php endif ?>
 <div class="widget board">
     <h3 class="title">Filtros</h3>
     <form id="filter-form" action="/admin/invests" method="get">
@@ -60,23 +55,39 @@
         <?php foreach ($the_filters as $filter=>$data) : ?>
         <div style="float:left;margin:5px;">
             <label for="<?php echo $filter ?>-filter"><?php echo $data['label'] ?></label><br />
-            <select id="<?php echo $filter ?>-filter" name="<?php echo $filter ?>" onchange="document.getElementById('filter-form').submit();">
+            <select id="<?php echo $filter ?>-filter" name="<?php echo $filter ?>">
                 <option value="<?php if ($filter == 'investStatus' || $filter == 'status') echo 'all' ?>"<?php if (($filter == 'investStatus' || $filter == 'status') && $filters[$filter] == 'all') echo ' selected="selected"'?>><?php echo $data['first'] ?></option>
             <?php foreach ($this[$filter] as $itemId=>$itemName) : ?>
-                <option value="<?php echo $itemId; ?>"<?php if ($filters[$filter] === (string) $itemId) echo ' selected="selected"';?>><?php echo $itemName; ?></option>
+                <option value="<?php echo $itemId; ?>"<?php if ($filters[$filter] === (string) $itemId) echo ' selected="selected"';?>><?php echo substr($itemName, 0, 50); ?></option>
             <?php endforeach; ?>
             </select>
         </div>
         <?php endforeach; ?>
+        <br clear="both" />
+
+        <div style="float:left;margin:5px;">
+            <label for="name-filter">Alias/Email del usuario:</label><br />
+            <input type="text" id ="name-filter" name="name" value ="<?php echo $filters['name']?>" />
+        </div>
+
+        <br clear="both" />
+
+        <div style="float:left;margin:5px;">
+            <input type="submit" value="filtrar" />
+        </div>
     </form>
     <br clear="both" />
-    <a href="/admin/invests"><?php echo Text::_("Quitar filtros"); ?></a>
+    <a href="/admin/invests/?reset=filters"><?php echo Text::_("Quitar filtros"); ?></a>
 </div>
 
 <div class="widget board">
 <?php if ($filters['filtered'] != 'yes') : ?>
     <p><?php echo Text::_("Es necesario poner algun filtro, hay demasiados registros!"); ?></p>
 <?php elseif (!empty($this['list'])) : ?>
+<?php $Total = 0; foreach ($this['list'] as $invest) { $Total += $invest->amount; } ?>
+    <p><strong>TOTAL:</strong>  <?php echo number_format($Total, 0, '', '.') ?> &euro;</p>
+    <p><strong>OJO!</strong> Resultado limitado a 999 registros como máximo.</p>
+    
     <table width="100%">
         <thead>
             <tr>
@@ -89,7 +100,7 @@
                 <th><?php echo Text::_("Metodo"); ?></th>
                 <th><?php echo Text::_("Estado aporte"); ?></th>
                 <th><?php echo Text::_("Importe"); ?></th>
-                <th>Extra</th>
+                <th><?php echo Text::_("Extra"); ?></th>
             </tr>
         </thead>
 
diff --git a/view/admin/licenses/edit.html.php b/view/admin/licenses/edit.html.php
index 750b8738..ebbf7737 100644
--- a/view/admin/licenses/edit.html.php
+++ b/view/admin/licenses/edit.html.php
@@ -22,7 +22,7 @@
 
 ?>
 <div class="widget board">
-    <form method="post" action="/admin/licenses?filter=<?php echo serialize($filters); ?>">
+    <form method="post" action="/admin/licenses">
 
         <input type="hidden" name="action" value="<?php echo $this['action']; ?>" />
         <input type="hidden" name="id" value="<?php echo $this['license']->id; ?>" />
diff --git a/view/admin/licenses/list.html.php b/view/admin/licenses/list.html.php
index 760afa93..d6aeaf58 100644
--- a/view/admin/licenses/list.html.php
+++ b/view/admin/licenses/list.html.php
@@ -25,8 +25,6 @@
 
 $filters = $this['filters'];
 ?>
-<!--            <a href="/add/?filter=<?php echo $filter; ?>" class="button red">Añadir licencia</a> -->
-
 <div class="widget board">
     <form id="filter-form" action="/admin/licenses" method="get">
         <label for="group-filter"><?php echo Text::_("Mostrar por grupo:"); ?></label>
@@ -68,18 +66,17 @@
         <tbody>
             <?php foreach ($this['licenses'] as $license) : ?>
             <tr>
-                <td><a href="/admin/licenses/edit/<?php echo $license->id; ?>/?filter=<?php echo $filters['group']; ?>">[<?php echo Text::_("Editar"); ?>]</a></td>
+                <td><a href="/admin/licenses/edit/<?php echo $license->id; ?>">[<?php echo Text::_("Editar"); ?>]</a></td>
                 <td><?php echo $license->name; ?></td>
                 <td><img src="/view/css/license/<?php echo $license->id; ?>.png" alt="<?php echo $license->id; ?>" title="<?php echo $license->name; ?>" /></td>
                 <td><?php echo $license->description; ?></td>
                 <td><?php echo !empty($license->group) ? $this['groups'][$license->group] : ''; ?></td>
                 <td><?php echo $license->order; ?></td>
-                <td><a href="/admin/licenses/up/<?php echo $license->id; ?>/?filter=<?php echo $filters['group']; ?>">[&uarr;]</a></td>
-                <td><a href="/admin/licenses/down/<?php echo $license->id; ?>/?filter=<?php echo $filters['group']; ?>">[&darr;]</a></td>
+                <td><a href="/admin/licenses/up/<?php echo $license->id; ?>">[&uarr;]</a></td>
+                <td><a href="/admin/licenses/down/<?php echo $license->id; ?>">[&darr;]</a></td>
                 <?php if ($translator) : ?>
                 <td><a href="/translate/license/edit/<?php echo $license->id; ?>" >[<?php echo Text::_("Traducir"); ?>]</a></td>
                 <?php endif; ?>
-<!--                                <td><a href="/admin/licenses/remove=<?php echo $license->id; ?>/?filter=<?php echo $filters['group']; ?>" onclick="return confirm('<?php echo Text::_("Seguro que deseas eliminar este registro?"); ?>');">[<?php echo Text::_("Quitar"); ?>]</a></td>  -->
             </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/view/admin/mailing/list.html.php b/view/admin/mailing/list.html.php
index ce995974..eb31627e 100644
--- a/view/admin/mailing/list.html.php
+++ b/view/admin/mailing/list.html.php
@@ -82,10 +82,6 @@
                     <?php endforeach; ?>
                     </select>
                 </td>
-                <td>
-                    <label for="work-filter">Talleristas</label><br />
-                    <input type="checkbox" id="work-filter" name="workshopper" value="1" <?php if (!empty($filters['workshopper'])) echo 'checked="checked"';?> />
-                </td>
             </tr>
             <tr>
                 <td colspan="3"><input type="submit" name="select" value="<?php echo Text::_("Buscar destinatarios"); ?>"></td>
diff --git a/view/admin/pages/edit.html.php b/view/admin/pages/edit.html.php
index b1109c10..6ff6f76f 100644
--- a/view/admin/pages/edit.html.php
+++ b/view/admin/pages/edit.html.php
@@ -42,7 +42,7 @@
 		skin: 'kama',
 		language: 'es',
 		height: '300px',
-		width: '800px'
+		width: '730px'
 	});
 });
 </script>
diff --git a/view/admin/pages/list.html.php b/view/admin/pages/list.html.php
index 1c130bf4..7204160a 100644
--- a/view/admin/pages/list.html.php
+++ b/view/admin/pages/list.html.php
@@ -23,6 +23,10 @@
 
 $translator = ACL::check('/translate') ? true : false;
 ?>
+<?php if (!isset($_SESSION['admin_node'])) : ?>
+<a href="/admin/pages/add" class="button">Nueva P&aacute;gina</a>
+<?php endif; ?>
+
 <div class="widget board">
     <?php if (!empty($this['pages'])) : ?>
     <table>
@@ -31,6 +35,7 @@
                 <th><!-- Editar --></th>
                 <th>Página</th>
                 <th>Descripción</th>
+                <th><!-- Abrir --></th>
                 <th><!-- Traducir --></th>
             </tr>
         </thead>
@@ -40,9 +45,12 @@
                 <td><a href="/admin/pages/edit/<?php echo $page->id; ?>">[Editar]</a></td>
                 <td><?php echo $page->name; ?></td>
                 <td><?php echo $page->description; ?></td>
-                <?php if ($translator) : ?>
-                <td><a href="/translate/pages/edit/<?php echo $page->id; ?>" >[Traducir]</a></td>
+                <td><a href="<?php echo $page->url; ?>" target="_blank">[Ver]</a></td>
+                <td>
+                <?php if ($translator && $node == \GOTEO_NODE) : ?>
+                <a href="/translate/pages/edit/<?php echo $page->id; ?>" >[Traducir]</a>
                 <?php endif; ?>
+                </td>
             </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/view/admin/projects/accounts.html.php b/view/admin/projects/accounts.html.php
index 04b8b33a..b7dd98be 100644
--- a/view/admin/projects/accounts.html.php
+++ b/view/admin/projects/accounts.html.php
@@ -21,64 +21,49 @@
 use Goteo\Library\Text,
     Goteo\Model,
     Goteo\Core\Redirection,
-    Goteo\Library\SuperForm;
-
-define('ADMIN_NOAUTOSAVE', true);
+    Goteo\Library\Message;
 
 $project = $this['project'];
 
 if (!$project instanceof Model\Project) {
+    Message::Error('Instancia de proyecto corrupta');
     throw new Redirection('/admin/projects');
 }
 
 $accounts = $this['accounts'];
+?>
+<div class="widget">
+    <p>Es necesario que un proyecto tenga una cuenta PayPal para ejecutar los cargos. La cuenta bancaria es solamente para tener toda la información en el mismo entorno pero no se utiliza en ningún proceso de este sistema.</p>
 
-$filters = $this['filters'];
-
-//arrastramos los filtros
-$filter = "?status={$filters['status']}&category={$filters['category']}";
-
+    <form method="post" action="/admin/projects" >
+        <input type="hidden" name="id" value="<?php echo $project->id ?>" />
 
-// Superform
-?>
-<form method="post" action="/admin/projects/<?php echo $filter ?>" class="project" enctype="multipart/form-data">
+    <p>
+        <label for="account-bank">Cuenta bancaria:</label><br />
+        <input type="text" id="account-bank" name="bank" value="<?php echo $accounts->bank; ?>" style="width: 475px;"/>
+    </p>
 
-    <?php echo new SuperForm(array(
+    <p>
+        <label for="account-bank_owner">Titular de la cuenta bancaria:</label><br />
+        <input type="text" id="account-bank_owner" name="bank_owner" value="<?php echo $accounts->bank_owner; ?>" style="width: 475px;"/>
+    </p>
 
-        'action'        => '',
-        'level'         => 3,
-        'method'        => 'post',
-        'title'         => '',
-        'hint'          => 'Es necesario que un proyecto tenga una cuenta PayPal para ejecutar los cargos. La cuenta bancaria es solamente para tener toda la información en el mismo entorno pero no se utiliza en este sistema',
-        'class'         => 'aqua',
-        'footer'        => array(
-            'view-step-preview' => array(
-                'type'  => 'submit',
-                'name'  => 'save-accounts',
-                'label' => Text::get('regular-save'),
-                'class' => 'next'
-            )
-        ),
-        'elements'      => array(
-            'id' => array (
-                'type' => 'hidden',
-                'value' => $project->id
-            ),
-            'bank' => array(
-                'type'      => 'textbox',
-                'title'     => 'Cuenta bancaria',
-                'value'     => $accounts->bank
-            ),
-            'paypal' => array(
-                'type'      => 'textbox',
-                'required'  => true,
-                'title'     => 'Cuenta paypal',
-                'value'     => $accounts->paypal
-            )
+    <p>
+        <label for="account-paypal">Cuenta PayPal:</label><br />
+        <input type="text" id="account-paypal" name="paypal" value="<?php echo $accounts->paypal; ?>" style="width: 475px;"/>
+    </p>
 
-        )
+    <p>
+        <label for="account-paypal_owner">Titular de la cuenta PayPal:</label><br />
+        <input type="text" id="account-paypal_owner" name="paypal_owner" value="<?php echo $accounts->paypal_owner; ?>" style="width: 475px;"/>
+    </p>
 
-    ));
-    ?>
+    <p>
+        <label for="account-allowpp">Permite uso de PayPal: </label>
+        <input type="checkbox" id="account-allowpp" name="allowpp" value="1"<?php if ($accounts->allowpp) echo ' checked="checked"'; ?>/>
+    </p>
 
-</form>
\ No newline at end of file
+        <input type="submit" name="save-accounts" value="Guardar" />
+        
+    </form>
+</div>
\ No newline at end of file
diff --git a/view/admin/projects/dates.html.php b/view/admin/projects/dates.html.php
index 72427967..a40ab0ff 100644
--- a/view/admin/projects/dates.html.php
+++ b/view/admin/projects/dates.html.php
@@ -18,9 +18,11 @@
  *
  */
 
-use Goteo\Library\Text,
+use Goteo\Core\View,
+    Goteo\Library\Text,
     Goteo\Model,
     Goteo\Core\Redirection,
+    Goteo\Library\Message,
     Goteo\Library\SuperForm;
 
 define('ADMIN_NOAUTOSAVE', true);
@@ -28,82 +30,75 @@
 $project = $this['project'];
 
 if (!$project instanceof Model\Project) {
+    Message::Error('Instancia de proyecto corrupta');
     throw new Redirection('/admin/projects');
 }
 
-$filters = $this['filters'];
+$elements = array(
+    'created' => array(
+        'type'      => 'datebox',
+        'title'     => 'Fecha de creación',
+        'value'     => !empty($project->created) ? $project->created : null
+    ),
+    'updated' => array(
+        'type'      => 'datebox',
+        'title'     => 'Fecha de enviado a revisión',
+        'value'     => !empty($project->updated) ? $project->updated : null
+    ),
+    'published' => array(
+        'type'      => 'datebox',
+        'title'     => 'Fecha de inicio de campaña',
+        'subtitle'  => '(Segun esta fecha se calculan los días)',
+        'value'     => !empty($project->published) ? $project->published : null
+    ),
+    'success' => array(
+        'type'      => 'datebox',
+        'title'     => 'Fecha de éxito',
+        'subtitle'  => '(marca fin de segunda ronda)',
+        'value'     => !empty($project->success) ? $project->success : null
+    ),
+    'closed' => array(
+        'type'      => 'datebox',
+        'title'     => 'Fecha de cierre',
+        'value'     => !empty($project->closed) ? $project->closed : null
+    ),
+    'passed' => array(
+        'type'      => 'datebox',
+        'title'     => 'Fecha de paso a segunda ronda',
+        'subtitle'  => '(marca fin de primera ronda)',
+        'value'     => !empty($project->passed) ? $project->passed : null
+    )
 
-//arrastramos los filtros
-$filter = "?status={$filters['status']}&category={$filters['category']}";
-
-
-// Superform
+);
 ?>
-<form method="post" action="/admin/projects/<?php echo $filter ?>" class="project" enctype="multipart/form-data">
+<div class="widget">
+<p>
+    <?php if (!empty($project->passed)) {
+        echo 'El proyecto terminó la primera ronda el día <strong>'.date('d/m/Y', strtotime($project->passed)).'</strong>.';
+        if ($project->passed != $project->willpass) {
+            echo '<br />Aunque debería haberla terminado el día <strong>'.date('d/m/Y', strtotime($project->willpass)).'</strong>.';
+        }
+    } else {
+        echo 'El proyecto terminará la primera ronda el día <strong>'.date('d/m/Y', strtotime($project->willpass)).'</strong>.';
+    } ?>
+
+</p>
 
-    <?php echo new SuperForm(array(
+    <p>Cambiar las fechas puede causar cambios en los días de campaña del proyecto.</p>
 
-        'action'        => '',
-        'level'         => 3,
-        'method'        => 'post',
-        'title'         => '',
-        'hint'          => 'Cambiar las fechas solamente si se conocen los efectos colaterales',
-        'class'         => 'aqua',
-        'footer'        => array(
-            'view-step-preview' => array(
-                'type'  => 'submit',
-                'name'  => 'save-dates',
-                'label' => Text::get('regular-save'),
-                'class' => 'next'
-            )
-        ),
-        'elements'      => array(
-            'id' => array (
-                'type' => 'hidden',
-                'value' => $project->id
-            ),
-            'created' => array(
-                'type'      => 'datebox',
-                'required'  => true,
-                'title'     => 'Fecha de creación',
-                'size'      => 8,
-                'value'     => !empty($project->created) ? $project->created : null
-            ),
-            'updated' => array(
-                'type'      => 'datebox',
-                'required'  => true,
-                'title'     => 'Fecha de enviado a revisión',
-                'size'      => 8,
-                'value'     => !empty($project->updated) ? $project->updated : null
-            ),
-            'published' => array(
-                'type'      => 'datebox',
-                'title'     => 'Fecha de inicio de campaña',
-                'size'      => 8,
-                'value'     => !empty($project->published) ? $project->published : null
-            ),
-            'success' => array(
-                'type'      => 'datebox',
-                'title'     => 'Fecha de éxito',
-                'size'      => 8,
-                'value'     => !empty($project->success) ? $project->success : null
-            ),
-            'closed' => array(
-                'type'      => 'datebox',
-                'title'     => 'Fecha de cierre',
-                'size'      => 8,
-                'value'     => !empty($project->closed) ? $project->closed : null
-            ),
-            'passed' => array(
-                'type'      => 'datebox',
-                'title'     => 'Fecha de paso a segunda ronda',
-                'size'      => 8,
-                'value'     => !empty($project->passed) ? $project->passed : null
-            )
+    <form method="post" action="/admin/projects" >
+        <input type="hidden" name="id" value="<?php echo $project->id ?>" />
 
-        )
+<?php foreach ($elements as $id=>$element) : ?>
+    <div id="<?php echo $id ?>">
+        <h4><?php echo $element['title'] ?>:</h4>
+        <?php echo new View('library/superform/view/element/datebox.html.php', array('value'=>$element['value'], 'id'=>$id, 'name'=>$id)); ?>
+        <?php if (!empty($element['subtitle'])) echo $element['subtitle'].'<br />'; ?>
+    </div>
+        <br />
+<?php endforeach; ?>
 
-    ));
-    ?>
+        <input type="submit" name="save-dates" value="Guardar" />
 
-</form>
\ No newline at end of file
+    </form>
+</div>
diff --git a/view/admin/projects/list.html.php b/view/admin/projects/list.html.php
index 34288265..380ece70 100644
--- a/view/admin/projects/list.html.php
+++ b/view/admin/projects/list.html.php
@@ -20,24 +20,28 @@
 
 use Goteo\Library\Text;
 
+// paginacion
+require_once 'library/pagination/pagination.php';
+
 $filters = $this['filters'];
 
-//arrastramos los filtros
-$filter = "?status={$filters['status']}&category={$filters['category']}&owner={$filters['owner']}&name={$filters['name']}&order={$filters['order']}";
+$the_filters = '';
+foreach ($filters as $key=>$value) {
+    $the_filters .= "&{$key}={$value}";
+}
 
+$pagedResults = new \Paginated($this['projects'], 10, isset($_GET['page']) ? $_GET['page'] : 1);
 ?>
+<a href="/admin/translates" class="button">Asignar traductores</a>
+
 <div class="widget board">
     <form id="filter-form" action="/admin/projects" method="get">
+        <input type="hidden" name="filtered" value="yes" />
         <table>
             <tr>
                 <td>
-                    <label for="owner-filter">Del autor:</label><br />
-                    <select id="owner-filter" name="owner" onchange="document.getElementById('filter-form').submit();">
-                        <option value="">Cualquier autor</option>
-                    <?php foreach ($this['owners'] as $ownerId=>$ownerName) : ?>
-                        <option value="<?php echo $ownerId; ?>"<?php if ($filters['owner'] == $ownerId) echo ' selected="selected"';?>><?php echo $ownerName; ?></option>
-                    <?php endforeach; ?>
-                    </select>
+                    <label for="name-filter">Alias/Email del autor:</label><br />
+                    <input type="text" id ="name-filter" name="name" value ="<?php echo $filters['name']?>" />
                 </td>
                 <td>
                     <label for="category-filter">De la categoría:</label><br />
@@ -51,20 +55,28 @@
             </tr>
             <tr>
                 <td>
-                    <label for="name-filter">Nombre:</label><br />
-                    <input id="name-filter" name="name" value="<?php echo $filters['name']; ?>" style="width:250px"/>
+                    <label for="proj_name-filter">Nombre del proyecto:</label><br />
+                    <input id="proj_name-filter" name="proj_name" value="<?php echo $filters['proj_name']; ?>" style="width:250px"/>
                 </td>
                 <td>
                     <label for="status-filter">Mostrar por estado:</label><br />
                     <select id="status-filter" name="status" onchange="document.getElementById('filter-form').submit();">
                         <option value="-1"<?php if ($filters['status'] == -1) echo ' selected="selected"';?>>Todos los estados</option>
+                        <option value="-2"<?php if ($filters['status'] == -2) echo ' selected="selected"';?>>En negociacion</option>
                     <?php foreach ($this['status'] as $statusId=>$statusName) : ?>
                         <option value="<?php echo $statusId; ?>"<?php if ($filters['status'] == $statusId) echo ' selected="selected"';?>><?php echo $statusName; ?></option>
                     <?php endforeach; ?>
                     </select>
                 </td>
                 <td>
-                    <label for="order-filter">Ver por:</label><br />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <input type="submit" name="filter" value="Buscar">
+                </td>
+                <td>
+                    <label for="order-filter">Ordenar por:</label><br />
                     <select id="order-filter" name="order" onchange="document.getElementById('filter-form').submit();">
                     <?php foreach ($this['orders'] as $orderId=>$orderName) : ?>
                         <option value="<?php echo $orderId; ?>"<?php if ($filters['order'] == $orderId) echo ' selected="selected"';?>><?php echo $orderName; ?></option>
@@ -72,66 +84,104 @@
                     </select>
                 </td>
             </tr>
-            <tr>
-                <td colspan="2">
-                    <input type="submit" name="filter" value="Buscar">
-                </td>
-            </tr>
         </table>
     </form>
+    <br clear="both" />
+    <a href="/admin/projects/?reset=filters">Quitar filtros</a>
+<?php if ($filters['filtered'] != 'yes') : ?>
+    <p>Es necesario poner algun filtro, hay demasiados registros!</p>
+<?php elseif (empty($this['projects'])) : ?>
+    <p>No se han encontrado registros</p>
+<?php else: ?>
+    <p><strong>OJO!</strong> Resultado limitado a 999 registros como máximo.</p>
+<?php endif; ?>
 </div>
 
+    
+<?php if (!empty($this['projects'])) : 
+    while ($project = $pagedResults->fetchPagedRow()) : 
+?>
 <div class="widget board">
-    <?php if (!empty($this['projects'])) : ?>
     <table>
         <thead>
             <tr>
-                <th>Proyecto</th> <!-- edit -->
-                <th>Creador</th> <!-- mailto -->
-                <th>Recibido</th> <!-- enviado a revision -->
-                <th>Estado</th>
-                <th>%</th> <!-- segun estado -->
-                <th>Días</th> <!-- segun estado -->
-                <th>Conseguido</th> <!-- segun estado -->
-                <th>Mínimo</th> <!-- segun estado -->
+                <th style="width: 250px;">Proyecto</th> <!-- edit -->
+                <th style="min-width: 150px;">Creador</th> <!-- mailto -->
+                <th style="min-width: 75px;">Recibido</th> <!-- enviado a revision -->
+                <th style="min-width: 80px;">Estado</th>
+                <th style="min-width: 50px;">Nodo</th>
+                <th style="min-width: 50px;">M&iacute;nimo</th>
+                <th style="min-width: 50px;">&Oacute;ptimo</th>
             </tr>
         </thead>
 
         <tbody>
-            <?php foreach ($this['projects'] as $project) : ?>
             <tr>
                 <td><a href="/project/<?php echo $project->id; ?>" target="_blank" title="Preview"><?php echo $project->name; ?></a></td>
-                <td><?php echo $project->user->name; ?></td>
+                <td><a href="mailto:<?php echo $project->user->email; ?>"><?php echo substr($project->user->email, 0, 100); ?></a></td>
                 <td><?php echo date('d-m-Y', strtotime($project->updated)); ?></td>
-                <td><?php echo $this['status'][$project->status]; ?></td>
-                <td><?php if ($project->status < 3)  echo $project->progress; ?></td>
-                <td><?php if ($project->status == 3) echo "$project->days (round {$project->round})"; ?></td>
-                <td><?php echo $project->invested; ?></td>
-                <td><?php echo $project->mincost; ?></td>
+                <td><?php echo ($project->status == 1 && !$project->draft) ? '<span style="color: green;">En negociación</span>' : $this['status'][$project->status]; ?></td>
+                <td style="text-align: center;"><?php echo $project->node; ?></td>
+                <td style="text-align: right;"><?php echo \amount_format($project->mincost).'€'; ?></td>
+                <td style="text-align: right;"><?php echo \amount_format($project->maxcost).'€'; ?></td>
             </tr>
             <tr>
-                <td colspan="8"> >>> Acciones:
+                <td colspan="7"><?php 
+                    if ($project->status < 3)  echo "Información al <strong>{$project->progress}%</strong>";
+                    if ($project->status == 3 && $project->round > 0) echo "Le quedan {$project->days} días de la {$project->round}ª ronda.&nbsp;&nbsp;&nbsp;<strong>Conseguido:</strong> ".\amount_format($project->invested)."€&nbsp;&nbsp;&nbsp;<strong>Cofin:</strong> {$project->num_investors}&nbsp;&nbsp;&nbsp;<strong>Colab:</strong> {$project->num_messegers}"; 
+                ?></td>
+            </tr>
+            <tr>
+                <td colspan="7">
+                    IR A:&nbsp;
                     <a href="/project/edit/<?php echo $project->id; ?>" target="_blank">[Editar]</a>
-                    <?php if ($project->status < 2) : ?><a href="<?php echo "/admin/projects/review/{$project->id}{$filter}"; ?>">[A revisión]</a><?php endif; ?>
-                    <?php if ($project->status < 3 && $project->status > 0) : ?><a href="<?php echo "/admin/projects/publish/{$project->id}{$filter}"; ?>" onclick="return confirm('El proyecto va a comenzar los 40 dias de la primera ronda de campaña, ¿comenzamos?');">[Publicar]</a><?php endif; ?>
-                    <?php if ($project->status != 1) : ?><a href="<?php echo "/admin/projects/enable/{$project->id}{$filter}"; ?>" onclick="return confirm('Mucho Ojo! si el proyecto esta en campaña, ¿Reabrimos la edicion?');">[Reabrir]</a><?php endif; ?>
-                    <?php if ($project->status == 4) : ?><a href="<?php echo "/admin/projects/fulfill/{$project->id}{$filter}"; ?>">[Retorno Cumplido]</a><?php endif; ?>
-                    <?php if ($project->status < 3 && $project->status > 0) : ?><a href="<?php echo "/admin/projects/cancel/{$project->id}{$filter}"; ?>" onclick="return confirm('El proyecto va a desaparecer del admin, solo se podra recuperar desde la base de datos, Ok?');">[Descartar]</a><?php endif; ?>
-                    <a href="<?php echo "/admin/projects/dates/{$project->id}{$filter}"; ?>">[Cambiar fechas]</a>
-                    <a href="<?php echo "/admin/projects/accounts/{$project->id}{$filter}"; ?>">[Cuentas]</a>
-                    <?php if ($project->translate) : ?><a href="<?php echo "/admin/translates/edit/{$project->id}"; ?>">[Ir a traducción]</a>
-                    <?php else : ?><a href="<?php echo "/admin/translates/add/?project={$project->id}"; ?>">[Habilitar traducción]</a><?php endif; ?>
-                    <a href="/admin/invests/report/<?php echo $project->id; ?>#detail" target="_blank">[Informe Financiacion]</a>
+                    <a href="/admin/users/?id=<?php echo $project->owner; ?>" target="_blank">[Impulsor]</a>
+                    <?php if (!isset($_SESSION['admin_node']) 
+                            || (isset($_SESSION['admin_node']) && $_SESSION['admin_node'] == \GOTEO_NODE)
+                            || (isset($_SESSION['admin_node']) && $user->node == $_SESSION['admin_node'])) : ?>
+                    <a href="/admin/accounts/?projects=<?php echo $project->id; ?>" title="Ver sus aportes">[Aportes]</a>
+                    <?php else:  ?>
+                    <a href="/admin/invests/?projects=<?php echo $project->id; ?>" title="Ver sus aportes">[Aportes]</a>
+                    <?php endif; ?>
+                    <a href="/admin/users/?project=<?php echo $project->id; ?>" title="Ver sus cofinanciadores">[Cofinanciadores]</a>
+                    <a href="/admin/projects/report/<?php echo $project->id; ?>" target="_blank">[Informe Financiacion]</a>
                 </td>
             </tr>
             <tr>
-                <td colspan="8"><hr /></td>
+                <td colspan="7">
+                    CAMBIAR:&nbsp;
+                    <a href="<?php echo "/admin/projects/dates/{$project->id}"; ?>">[Fechas]</a>
+                    <a href="<?php echo "/admin/projects/accounts/{$project->id}"; ?>">[Cuentas]</a>
+                    <?php if ($project->status < 4) : ?><a href="<?php echo "/admin/projects/rebase/{$project->id}"; ?>" onclick="return confirm('Esto es MUY DELICADO, seguimos?');">[Id]</a><?php endif; ?>
+                    &nbsp;|&nbsp;
+                    <?php if ($project->status < 2) : ?><a href="<?php echo "/admin/projects/review/{$project->id}"; ?>" onclick="return confirm('El creador no podrá editarlo más, ok?');">[A revisión]</a><?php endif; ?>
+                    <?php if ($project->status < 3 && $project->status > 0) : ?><a href="<?php echo "/admin/projects/publish/{$project->id}"; ?>" onclick="return confirm('El proyecto va a comenzar los 40 dias de la primera ronda de campaña, ¿comenzamos?');">[Publicar]</a><?php endif; ?>
+                    <?php if ($project->status != 1) : ?><a href="<?php echo "/admin/projects/enable/{$project->id}"; ?>" onclick="return confirm('Mucho Ojo! si el proyecto esta en campaña, ¿Reabrimos la edicion?');">[Reabrir edición]</a><?php endif; ?>
+                    <?php if ($project->status == 4) : ?><a href="<?php echo "/admin/projects/fulfill/{$project->id}"; ?>" onclick="return confirm('El proyecto pasara a ser un caso de éxito, ok?');">[Retorno Cumplido]</a><?php endif; ?>
+                    <?php if ($project->status == 5) : ?><a href="<?php echo "/admin/projects/unfulfill/{$project->id}"; ?>" onclick="return confirm('Lo echamos un paso atras, ok?');">[Retorno Pendiente]</a><?php endif; ?>
+                    <?php if ($project->status < 3 && $project->status > 0) : ?><a href="<?php echo "/admin/projects/cancel/{$project->id}"; ?>" onclick="return confirm('El proyecto va a desaparecer del admin, solo se podra recuperar desde la base de datos, Ok?');">[Descartar]</a><?php endif; ?>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="5">
+                    GESTIONAR:&nbsp;
+                    <?php if ($project->status == 1) : ?><a href="<?php echo "/admin/reviews/add/{$project->id}"; ?>" onclick="return confirm('Se va a iniciar revisión de un proyecto en estado Edición, ok?');">[Iniciar revisión]</a><?php endif; ?>
+                    <?php if ($project->status == 2) : ?><a href="<?php echo "/admin/reviews/?project=".urlencode($project->id); ?>">[Ir a la revisión]</a><?php endif; ?>
+                    <?php if ($project->translate) : ?><a href="<?php echo "/admin/translates/edit/{$project->id}"; ?>">[Ir a la traducción]</a>
+                    <?php else : ?><a href="<?php echo "/admin/translates/add/?project={$project->id}"; ?>">[Habilitar traducción]</a><?php endif; ?>
+                    <a href="/admin/projects/images/<?php echo $project->id; ?>">[Organizar imágenes]</a>
+                    <?php if (in_array($project->status, array('1', '2', '3')) && !isset($project->called)) : ?><a href="<?php echo "/admin/projects/assign/{$project->id}"; ?>">[Asignarlo a una convocatoria]</a><?php endif; ?>
+                    <?php if (isset($this['contracts'][$project->id])) : ?><a href="<?php echo "/admin/contracts/preview/{$project->id}"; ?>">[Contrato]</a><?php endif; ?>
+                    <?php if ($project->status < 3) : ?><a href="<?php echo "/admin/projects/reject/{$project->id}"; ?>" onclick="return confirm('Se va a enviar un mail automáticamente pero no cambiará el estado, ok?');">[Rechazo express]</a><?php endif; ?>
+                </td>
             </tr>
-            <?php endforeach; ?>
         </tbody>
 
     </table>
-    <?php else : ?>
-    <p>No se han encontrado registros</p>
-    <?php endif; ?>
-</div>
\ No newline at end of file
+</div>
+<?php endwhile; ?>
+<ul id="pagination">
+<?php   $pagedResults->setLayout(new DoubleBarLayout());
+        echo $pagedResults->fetchPagedNavigation($the_filters); ?>
+</ul>
+<?php endif; ?>
diff --git a/view/admin/promote/edit.html.php b/view/admin/promote/edit.html.php
index 9c8d3187..4345114d 100644
--- a/view/admin/promote/edit.html.php
+++ b/view/admin/promote/edit.html.php
@@ -23,9 +23,11 @@
 
 $promo = $this['promo'];
 
+$node = isset($_SESSION['admin_node']) ? $_SESSION['admin_node'] : \GOTEO_NODE;
+
 // proyectos disponibles
 // si tenemos ya proyecto seleccionado lo incluimos
-$projects = Model\Promote::available($promo->project);
+$projects = Model\Promote::available($promo->project, $node);
 $status = Model\Project::status();
 
 ?>
@@ -44,15 +46,17 @@
     </select>
 </p>
 
+<?php if ($node == \GOTEO_NODE) : ?>
 <p>
-    <label for="promo-name">Título:</label><span style="font-style:italic;">Máximo 20 caracteres</span><br />
-    <input type="text" name="title" id="promo-title" value="<?php echo $promo->title; ?>" size="50" maxlength="20" />
+    <label for="promo-name">Título:</label><span style="font-style:italic;">Máximo 24 caracteres</span><br />
+    <input type="text" name="title" id="promo-title" value="<?php echo $promo->title; ?>" maxlength="24" style="width:500px;" />
 </p>
 
 <p>
     <label for="promo-description">Descripción:</label><span style="font-style:italic;">Máximo 100 caracteres</span><br />
-    <input type="text" name="description" id="promo-description" maxlength="100" value="<?php echo $promo->description; ?>" size="120" />
+    <input type="text" name="description" id="promo-description" maxlength="100" value="<?php echo $promo->description; ?>" style="width:750px;" />
 </p>
+<?php endif; ?>
 
 <p>
     <label>Publicado:</label><br />
diff --git a/view/admin/promote/list.html.php b/view/admin/promote/list.html.php
index a3e67679..d22b6dec 100644
--- a/view/admin/promote/list.html.php
+++ b/view/admin/promote/list.html.php
@@ -22,15 +22,15 @@
 
 $translator = ACL::check('/translate') ? true : false;
 ?>
-<a href="/admin/promote/add" class="button red">Nuevo destacado</a>
+<a href="/admin/promote/add" class="button">Nuevo destacado</a>
 
 <div class="widget board">
     <?php if (!empty($this['promoted'])) : ?>
     <table>
         <thead>
             <tr>
-                <th>Proyecto</th> <!-- preview -->
-                <th>Título</th> <!-- title -->
+                <th></th> <!-- preview -->
+                <th>Proyecto</th> <!-- title -->
                 <th>Estado</th> <!-- status -->
                 <th>Posición</th> <!-- order -->
                 <th><!-- Subir --></th>
@@ -45,13 +45,13 @@
         <tbody>
             <?php foreach ($this['promoted'] as $promo) : ?>
             <tr>
-                <td><a href="/project/<?php echo $promo->project; ?>" target="_blank" title="Preview"><?php echo $promo->name; ?></a></td>
-                <td><?php echo ($promo->active) ? '<strong>'.$promo->title.'</strong>' : $promo->title; ?></td>
+                <td><a href="/project/<?php echo $promo->project; ?>" target="_blank" title="Preview">[Ver]</a></td>
+                <td><?php echo ($promo->active) ? '<strong>'.$promo->name.'</strong>' : $promo->name; ?></td>
                 <td><?php echo $promo->status; ?></td>
                 <td><?php echo $promo->order; ?></td>
-                <td><a href="/admin/promote/up/<?php echo $promo->project; ?>">[&uarr;]</a></td>
-                <td><a href="/admin/promote/down/<?php echo $promo->project; ?>">[&darr;]</a></td>
-                <td><a href="/admin/promote/edit/<?php echo $promo->project; ?>">[Editar]</a></td>
+                <td><a href="/admin/promote/up/<?php echo $promo->id; ?>">[&uarr;]</a></td>
+                <td><a href="/admin/promote/down/<?php echo $promo->id; ?>">[&darr;]</a></td>
+                <td><a href="/admin/promote/edit/<?php echo $promo->id; ?>">[Editar]</a></td>
                 <td><?php if ($promo->active) : ?>
                 <a href="/admin/promote/active/<?php echo $promo->id; ?>/off">[Ocultar]</a>
                 <?php else : ?>
@@ -60,7 +60,7 @@
                 <?php if ($translator) : ?>
                 <td><a href="/translate/promote/edit/<?php echo $promo->id; ?>" >[Traducir]</a></td>
                 <?php endif; ?>
-                <td><a href="/admin/promote/remove/<?php echo $promo->project; ?>" onclick="return confirm('Seguro que deseas eliminar este registro?');">[Quitar]</a></td>
+                <td><a href="/admin/promote/remove/<?php echo $promo->id; ?>" onclick="return confirm('Seguro que deseas eliminar este registro?');">[Quitar]</a></td>
             </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/view/admin/sended/list.html.php b/view/admin/sended/list.html.php
index e9d15ead..9f11df7f 100644
--- a/view/admin/sended/list.html.php
+++ b/view/admin/sended/list.html.php
@@ -18,80 +18,91 @@
  *
  */
 
-use Goteo\Library\Text;
+use Goteo\Library\Text,
+    Goteo\Core\View;
 
 // paginacion
 require_once 'library/pagination/pagination.php';
 
 $filters = $this['filters'];
 $templates = $this['templates'];
+$the_filters = '';
+foreach ($filters as $key => $value) {
+    $the_filters .= "&{$key}={$value}";
+}
 
-//arrastramos los filtros
-$filter = "?user={$filters['user']}&template={$filters['template']}";
+$pagedResults = new \Paginated($this['sended'], 20, isset($_GET['page']) ? $_GET['page'] : 1);
+?>
+<div class="widget board">
+    <form id="filter-form" action="/admin/sended" method="get">
+        <div style="float:left;margin:5px;">
+            <label for="user-filter">ID, nombre o email del destinatario</label><br />
+            <input id="user-filter" name="user" value="<?php echo $filters['user']; ?>" style="width:300px;"/>
+        </div>
 
-$sended = $this['sended'];
+        <div style="float:left;margin:5px;">
+            <label for="template-filter">Plantilla</label><br />
+            <select id="template-filter" name="template" onchange="document.getElementById('filter-form').submit();" >
+                <option value="">Todas las plantillas</option>
+                <?php foreach ($templates as $templateId => $templateName) : ?>
+                    <option value="<?php echo $templateId; ?>"<?php if ($filters['template'] == $templateId)
+                    echo ' selected="selected"'; ?>><?php echo $templateName; ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
 
-$pagedResults = new \Paginated($sended, 20, isset($_GET['page']) ? $_GET['page'] : 1);
+        <br clear="both" />
 
 
-?>
-<div class="widget board">
-    <form id="filter-form" action="/admin/sended" method="get">
+        <div style="float:left;margin:5px;" id="date-filter-from">
+            <label for="date-filter-from">Fecha desde</label><br />
+<?php echo new View('library/superform/view/element/datebox.html.php', array('value' => $filters['date_from'], 'id' => 'date-filter-from', 'name' => 'date_from')); ?>
+        </div>
+        <div style="float:left;margin:5px;" id="date-filter-until">
+            <label for="date-filter-until">Fecha hasta</label><br />
+<?php echo new View('library/superform/view/element/datebox.html.php', array('value' => $filters['date_until'], 'id' => 'date-filter-until', 'name' => 'date_until')); ?>
+        </div>
+        <div style="float:left;margin:5px;">
+            <input type="submit" name="filter" value="Filtrar">
+        </div>
 
-        <table>
-            <tr>
-                <td>
-                    <label for="user-filter">ID, nombre o email del destinatario</label><br />
-                    <input id="user-filter" name="user" value="<?php echo $filters['user']; ?>" style="width:300px;"/>
-                </td>
-                <td>
-                    <label for="template-filter">Plantilla</label><br />
-                    <select id="template-filter" name="template" >
-                        <option value="">Todas las plantillas</option>
-                    <?php foreach ($templates as $templateId=>$templateName) : ?>
-                        <option value="<?php echo $templateId; ?>"<?php if ($filters['template'] == $templateId) echo ' selected="selected"';?>><?php echo $templateName; ?></option>
-                    <?php endforeach; ?>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2"><input type="submit" name="filter" value="Filtrar"></td>
-            </tr>
-        </table>
     </form>
 </div>
 
-<?php if (!empty($sended)) : ?>
 <div class="widget board">
-    <table>
-        <thead>
-            <tr>
-                <th width="5%"><!-- Si no ves --></th>
-                <th width="45%">Destinatario</th>
-                <th width="35%">Plantilla</th>
-                <th width="15%">Fecha</th>
-                <th><!-- reenviar --></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php while ($send = $pagedResults->fetchPagedRow()) : 
-                $link = SITE_URL.'/mail/'.base64_encode(md5(uniqid()).'¬'.$send->email.'¬'.$send->id).'/?email='.$send->email;
-                ?>
-            <tr>
-                <td><a href="<?php echo $link; ?>" target="_blank">[Enlace]</a></td>
-                <td><?php echo $send->user . " [ {$send->email} ]"; ?></td>
-                <td><?php echo $templates[$send->template]; ?></td>
-                <td><?php echo $send->date; ?></td>
-                <td><!-- <a href="#" target="_blank">[Reenviar]</a> --></td>
-            </tr>
-            <?php endwhile; ?>
-        </tbody>
-    </table>
-</div>
-<ul id="pagination">
-<?php   $pagedResults->setLayout(new DoubleBarLayout());
-        echo $pagedResults->fetchPagedNavigation(str_replace('?', '&', $filter)); ?>
-</ul>
+    <?php if ($filters['filtered'] != 'yes') : ?>
+        <p>Es necesario poner algun filtro, hay demasiados registros!</p>
+<?php elseif (!empty($this['sended'])) : ?>
+        <table>
+            <thead>
+                <tr>
+                    <th width="5%"><!-- Si no ves --></th>
+                    <th width="45%">Destinatario</th>
+                    <th width="35%">Plantilla</th>
+                    <th width="15%">Fecha</th>
+                    <th><!-- reenviar --></th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php
+                while ($send = $pagedResults->fetchPagedRow()) :
+                    $link = SITE_URL . '/mail/' . base64_encode(md5(uniqid()) . '¬' . $send->email . '¬' . $send->id) . '/?email=' . urlencode($send->email);
+                    ?>
+                    <tr>
+                        <td><a href="<?php echo $link; ?>" target="_blank">[Enlace]</a></td>
+                        <td><a href="/admin/users/?name=<?php echo urlencode($send->email) ?>"><?php echo $send->email; ?></a></td>
+                        <td><?php echo $templates[$send->template]; ?></td>
+                        <td><?php echo $send->date; ?></td>
+                        <td><!-- <a href="#" target="_blank">[Reenviar]</a> --></td>
+                    </tr>
+    <?php endwhile; ?>
+            </tbody>
+        </table>
+    </div>
+    <ul id="pagination">
+    <?php $pagedResults->setLayout(new DoubleBarLayout());
+    echo $pagedResults->fetchPagedNavigation(str_replace('?', '&', $the_filters)); ?>
+    </ul>
 <?php else : ?>
-<p>No se han encontrado registros</p>
+    <p>No se han encontrado registros</p>
 <?php endif; ?>
\ No newline at end of file
diff --git a/view/admin/templates/edit.html.php b/view/admin/templates/edit.html.php
index 8ba4794c..99ed4190 100644
--- a/view/admin/templates/edit.html.php
+++ b/view/admin/templates/edit.html.php
@@ -25,6 +25,7 @@
 
 <div class="widget board">
     <form method="post" action="/admin/templates/edit/<?php echo $this['template']->id; ?>">
+        <input type="hidden" name="group" value="<?php echo $this['template']->group; ?>" />
         <p>
             <label for="tpltitle">Título:</label><br />
             <input id="tpltitle" type="text" name="title" size="120" value="<?php echo $this['template']->title; ?>" />
diff --git a/view/admin/templates/list.html.php b/view/admin/templates/list.html.php
index 6eb97f4a..45c98dae 100644
--- a/view/admin/templates/list.html.php
+++ b/view/admin/templates/list.html.php
@@ -22,7 +22,36 @@
     Goteo\Core\ACL;
 
 $translator = ACL::check('/translate') ? true : false;
+
+$filters = $this['filters'];
 ?>
+<div class="widget board">
+    <form id="filter-form" action="/admin/templates" method="get">
+        <table>
+            <tr>
+                <td>
+                    <label for="group-filter">Filtrar agrupaci&oacute;n:</label><br />
+                    <select id="group-filter" name="group">
+                        <option value="">Todas las agrupaciones</option>
+                    <?php foreach ($this['groups'] as $groupId=>$groupName) : ?>
+                        <option value="<?php echo $groupId; ?>"<?php if ($filters['group'] == $groupId) echo ' selected="selected"';?>><?php echo $groupName; ?></option>
+                    <?php endforeach; ?>
+                    </select>
+                </td>
+                <td>
+                    <label for="name-filter">Filtrar por nombre o asunto:</label><br />
+                    <input type="text" id ="name-filter" name="name" value ="<?php echo $filters['name']?>" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <input type="submit" name="filter" value="Filtrar">
+                </td>
+            </tr>
+        </table>
+    </form>
+</div>
+
 <div class="widget board">
     <?php if (!empty($this['templates'])) : ?>
     <table>
diff --git a/view/admin/texts/list.html.php b/view/admin/texts/list.html.php
index 0a748e81..95d07789 100644
--- a/view/admin/texts/list.html.php
+++ b/view/admin/texts/list.html.php
@@ -24,17 +24,6 @@
 $translator = ACL::check('/translate') ? true : false;
 
 $filters = $this['filters'];
-
-// si hay filtro lo arrastramos
-if (!empty($filters)) {
-    $filter = "?";
-    foreach ($filters as $key => $fil) {
-        $filter .= "$key={$fil['value']}&";
-    }
-} else {
-    $filter = '';
-}
-
 $botones = array(
     'edit' => '[Editar]',
     'remove' => '[Quitar]',
@@ -48,7 +37,7 @@
 
 ?>
 <?php if (!empty($this['addbutton'])) : ?>
-<a href="<?php echo $this['url'] ?>/add" class="button red"><?php echo $this['addbutton'] ?></a>
+<a href="<?php echo $this['url'] ?>/add" class="button"><?php echo $this['addbutton'] ?></a>
 <?php endif; ?>
 <!-- Filtro -->
 <?php if (!empty($filters)) : ?>
@@ -76,7 +65,9 @@
 
 <!-- lista -->
 <div class="widget board">
-    <?php if (!empty($this['data'])) : ?>
+<?php if ($filters['filtered'] != 'yes') : ?>
+    <p>Es necesario poner algun filtro, hay demasiados registros!</p>
+<?php elseif (!empty($this['data'])) : ?>
     <table>
         <thead>
             <tr>
@@ -89,7 +80,7 @@
         <tbody>
             <?php foreach ($this['data'] as $item) : ?>
             <tr>
-                <td><a href="/admin/texts/edit/<?php echo $item->id; ?>/<?php echo $filter; ?>">[Editar]</a></td>
+                <td><a href="/admin/texts/edit/<?php echo $item->id; ?>">[Editar]</a></td>
                 <td><?php echo $item->text; ?></td>
                 <td><?php echo $item->group; ?></td>
                 <?php if ($translator) : ?>
diff --git a/view/admin/translates/edit.html.php b/view/admin/translates/edit.html.php
index e104bc95..44fe2d84 100644
--- a/view/admin/translates/edit.html.php
+++ b/view/admin/translates/edit.html.php
@@ -25,11 +25,18 @@
 $langs = Lang::getAll();
 
 $filters = $this['filters'];
-
-//arrastramos los filtros
-$filter = "?owner={$filters['owner']}&translator={$filters['translator']}";
-
 ?>
+<script type="text/javascript">
+function assign() {
+    if (document.getElementById('assign-user').value != '') {
+        document.getElementById('form-assign').submit();
+        return true;
+    } else {
+        alert('No has seleccionado ningun traductor');
+        return false;
+    }
+}
+</script>
 <div class="widget">
 <?php if ($this['action'] == 'edit') : ?>
     <h3 class="title">Traductores para el proyecto <?php echo $project->name ?></h3>
@@ -42,13 +49,13 @@
             <?php foreach ($project->translators as $userId=>$userName) : ?>
             <tr>
                 <td><?php if ($userId == $project->owner) echo '(AUTOR) '; ?><?php echo $userName; ?></td>
-                <td><a href="/admin/translates/unassign/<?php echo $project->id; ?>/<?php echo $filter; ?>&user=<?php echo $userId; ?>">[Desasignar]</a></td>
+                <td><a href="/admin/translates/unassign/<?php echo $project->id; ?>/?user=<?php echo $userId; ?>">[Desasignar]</a></td>
             </tr>
             <?php endforeach; ?>
             <tr>
-                <form id="form-assign" action="/admin/translates/assign/<?php echo $project->id; ?>/<?php echo $filter; ?>" method="get">
+                <form id="form-assign" action="/admin/translates/assign/<?php echo $project->id; ?>" method="get">
                 <td colspan="2">
-                    <select name="user">
+                    <select id="assign-user" name="user">
                         <option value="">Selecciona otro traductor</option>
                         <?php foreach ($this['translators'] as $user) :
                             if (in_array($user->id, array_keys($project->translators))) continue;
@@ -57,17 +64,17 @@
                         <?php endforeach; ?>
                     </select>
                 </td>
-                <td><a href="#" onclick="document.getElementById('form-assign').submit(); return false;">[Asignar]</a></td>
+                <td><a href="#" onclick="return assign();" class="button">Asignar</a></td>
                 </form>
             </tr>
         </table>
         <hr />
-        <a href="/admin/translates/close/<?php echo $project->id; ?>" class="button red" onclick="return confirm('Seguro que deseas dar por finalizada esta traducción?')">Cerrar la traducción</a>&nbsp;&nbsp;&nbsp;
-        <a href="/admin/translates/send/<?php echo $project->id; ?>" class="button green" onclick="return confirm('Se va a enviar un email?')">Avisar al autor</a>
+        <a href="/admin/translates/close/<?php echo $project->id; ?>" class="button" onclick="return confirm('Seguro que deseas dar por finalizada esta traducción?')">Cerrar la traducción</a>&nbsp;&nbsp;&nbsp;
+        <a href="/admin/translates/send/<?php echo $project->id; ?>" class="button green" onclick="return confirm('Se va a enviar un email automaticamente, ok?')">Avisar al autor</a>
         <hr />
 <?php endif; ?>
 
-    <form method="post" action="/admin/translates/<?php echo $this['action']; ?>/<?php echo $project->id; ?>/?filter=<?php echo $this['filter']; ?>">
+    <form method="post" action="/admin/translates/<?php echo $this['action']; ?>/<?php echo $project->id; ?>">
 
         <table>
             <tr>
diff --git a/view/admin/translates/list.html.php b/view/admin/translates/list.html.php
index d82ebca3..68a42eb7 100644
--- a/view/admin/translates/list.html.php
+++ b/view/admin/translates/list.html.php
@@ -21,12 +21,8 @@
 use Goteo\Library\Text;
 
 $filters = $this['filters'];
-
-//arrastramos los filtros
-$filter = "?owner={$filters['owner']}&translator={$filters['translator']}";
-
 ?>
-<a href="/admin/translates/add" class="button red">Nuevo proyecto para traducir</a>
+<a href="/admin/translates/add" class="button">Nuevo proyecto para traducir</a>
 
 <div class="widget board">
 <form id="filter-form" action="/admin/translates" method="get">
@@ -64,7 +60,7 @@
                 <tbody>
                     <?php foreach ($this['projects'] as $project) : ?>
                     <tr>
-                        <td><a href="/admin/translates/edit/<?php echo $project->id; ?>/<?php echo $filter; ?>">[Editar]</a></td>
+                        <td><a href="/admin/translates/edit/<?php echo $project->id; ?>">[Editar]</a></td>
                         <td><a href="/project/<?php echo $project->id; ?>" target="_blank" title="Preview"><?php echo $project->name; ?></a></td>
                         <td><?php echo $project->user->name; ?></td>
                         <td><?php echo $project->lang; ?></td>
diff --git a/view/admin/users/list.html.php b/view/admin/users/list.html.php
index 2e1d24bf..c4f935c1 100644
--- a/view/admin/users/list.html.php
+++ b/view/admin/users/list.html.php
@@ -20,25 +20,49 @@
 
 use Goteo\Library\Text;
 
+// paginacion
+require_once 'library/pagination/pagination.php';
+
 $filters = $this['filters'];
+$users = $this['users'];
+
+// la ordenación por cantidad y proyectos hay que hacerla aqui
+if ($filters['order'] == 'amount') {
+    uasort($users,
+        function ($a, $b) {
+            if ($a->namount == $b->namount) return 0;
+            return ($a->namount < $b->namount) ? 1 : -1;
+            }
+        );
+}
+if ($filters['order'] == 'projects') {
+    uasort($users,
+        function ($a, $b) {
+            if ($a->nprojs == $b->nprojs) return 0;
+            return ($a->nprojs < $b->nprojs) ? 1 : -1;
+            }
+        );
+}
 
-//arrastramos los filtros
-$filter = "?status={$filters['status']}&interest={$filters['interest']}&role={$filters['role']}&order={$filters['order']}";
+$the_filters = '';
+foreach ($filters as $key=>$value) {
+    $the_filters .= "&{$key}={$value}";
+}
 
+$pagedResults = new \Paginated($users, 20, isset($_GET['page']) ? $_GET['page'] : 1);
 ?>
-<a href="/admin/users/add" class="button red">Crear usuario</a>
+<a href="/admin/users/add" class="button">Crear usuario</a>
 
 <div class="widget board">
     <form id="filter-form" action="/admin/users" method="get">
-
         <table>
             <tr>
                 <td>
-                    <label for="status-filter">Mostrar por estado:</label><br />
-                    <select id="status-filter" name="status" onchange="document.getElementById('filter-form').submit();">
-                        <option value="">Todos los estados</option>
-                    <?php foreach ($this['status'] as $statusId=>$statusName) : ?>
-                        <option value="<?php echo $statusId; ?>"<?php if ($filters['status'] == $statusId) echo ' selected="selected"';?>><?php echo $statusName; ?></option>
+                    <label for="role-filter">Con rol:</label><br />
+                    <select id="role-filter" name="role" onchange="document.getElementById('filter-form').submit();">
+                        <option value="">Cualquier rol</option>
+                    <?php foreach ($this['roles'] as $roleId=>$roleName) : ?>
+                        <option value="<?php echo $roleId; ?>"<?php if ($filters['role'] == $roleId) echo ' selected="selected"';?>><?php echo $roleName; ?></option>
                     <?php endforeach; ?>
                     </select>
                 </td>
@@ -66,10 +90,9 @@
                 </td>
             </tr>
             <tr>
-                <td colspan="3">
+                <td>
                     <input type="submit" name="filter" value="Buscar">
                 </td>
-                <td></td>
                 <td>
                     <label for="order-filter">Ver por:</label><br />
                     <select id="order-filter" name="order" onchange="document.getElementById('filter-form').submit();">
@@ -82,51 +105,70 @@
         </table>
 
     </form>
+    <br clear="both" />
+    <a href="/admin/users/?reset=filters">Quitar filtros</a>
 </div>
 
 <div class="widget board">
-    <?php if (!empty($this['users'])) : ?>
+<?php if ($filters['filtered'] != 'yes') : ?>
+    <p>Es necesario poner algun filtro, hay demasiados registros!</p>
+<?php elseif (!empty($users)) : ?>
     <table>
         <thead>
             <tr>
-                <th></th>
                 <th>Alias</th> <!-- view profile -->
                 <th>User</th>
                 <th>Email</th>
+                <th>Proyectos</th>
+                <th>Cantidad</th>
                 <th>Alta</th>
-                <th>
-                    <!-- Inactivo -->
-                    <!-- Oculto -->
-                    <!-- Revisor -->
-                    <!-- Traductor -->
-                </th>
-                <th></th>
-                <th></th>
             </tr>
         </thead>
 
         <tbody>
-            <?php foreach ($this['users'] as $user) : ?>
+            <?php while ($user = $pagedResults->fetchPagedRow()) :
+                $adminNode = ($user->admin) ? $user->admin_node : null;
+                ?>
             <tr>
-                <td><a href="/admin/users/manage/<?php echo $user->id; ?>">[Gestionar]</a></td>
-                <td><a href="/user/<?php echo $user->id; ?>" target="_blank" title="Preview"><?php echo $user->name; ?></a></td>
-                <td><strong><?php echo $user->id; ?></strong></td>
+                <td><a href="/user/profile/<?php echo $user->id; ?>" target="_blank" <?php echo ($adminNode != 'goteo') ? 'style="color: green;" title="Admin nodo '.$adminNode.'"' : 'title="Ver perfil público"'; ?>><?php echo substr($user->name, 0, 20); ?></a></td>
+                <td><strong><?php echo substr($user->id, 0, 20); ?></strong></td>
                 <td><a href="mailto:<?php echo $user->email; ?>"><?php echo $user->email; ?></a></td>
+                <td><?php echo $user->nprojs; ?></td>
+                <td><?php echo \amount_format($user->namount); ?> &euro;</td>
                 <td><?php echo $user->register_date; ?></td>
-                <td>
-                    <?php echo $user->active ? '' : ' Inactivo'; ?>
-                    <?php echo $user->hide ? ' Oculto' : ''; ?>
-                    <?php echo $user->checker ? ' Revisor' : ''; ?>
-                    <?php echo $user->translator ? ' Traductor' : ''; ?>
+            </tr>
+            <tr>
+                <td><a href="/admin/users/manage/<?php echo $user->id; ?>" title="Gestionar">[Gestionar]</a></td>
+                <td><?php if ($user->nprojs > 0) {
+                    if (!isset($_SESSION['admin_node']) || (isset($_SESSION['admin_node']) && $user->node == $_SESSION['admin_node'])) : ?>
+                <a href="/admin/accounts/?name=<?php echo $user->email; ?>" title="Ver sus aportes">[Aportes]</a>
+                <?php else:  ?>
+                <a href="/admin/invests/?name=<?php echo $user->email; ?>" title="Ver sus aportes">[Aportes]</a>
+                <?php endif; } ?></td>
+                <td colspan="5" style="color:blue;">
+                    <?php echo (!$user->active && $user->hide) ? ' Baja ' : ''; ?>
+                    <?php echo $user->active ? '' : ' Inactivo '; ?>
+                    <?php echo $user->hide ? ' Oculto ' : ''; ?>
+                    <?php echo $user->checker ? ' Revisor ' : ''; ?>
+                    <?php echo $user->translator ? ' Traductor ' : ''; ?>
+                    <?php echo $user->caller ? ' Convocador ' : ''; ?>
+                    <?php echo $user->admin ? ' Admin ' : ''; ?>
+                    <?php echo $user->manager ? ' Gestor ' : ''; ?>
+                    <?php echo $user->vip ? ' VIP ' : ''; ?>
                 </td>
-                <td><a href="/admin/users/edit/<?php echo $user->id; ?>">[Editar]</a></td>
-                <td><a href="/admin/users/impersonate/<?php echo $user->id; ?>">[Suplantar]</a></td>
             </tr>
-            <?php endforeach; ?>
+            <tr>
+                <td colspan="6"><hr /></td>
+            </tr>
+            <?php endwhile; ?>
         </tbody>
 
     </table>
-    <?php else : ?>
-    <p>No se han encontrado registros</p>
-    <?php endif; ?>
-</div>
\ No newline at end of file
+</div>
+<ul id="pagination">
+<?php   $pagedResults->setLayout(new DoubleBarLayout());
+        echo $pagedResults->fetchPagedNavigation($the_filters); ?>
+</ul>
+<?php else : ?>
+<p>No se han encontrado registros</p>
+<?php endif; ?>
diff --git a/view/admin/users/manage.html.php b/view/admin/users/manage.html.php
index 3e0527d2..dc41060a 100644
--- a/view/admin/users/manage.html.php
+++ b/view/admin/users/manage.html.php
@@ -21,75 +21,114 @@
 use Goteo\Library\Text;
 
 $user = $this['user'];
-
-$roles = $user->roles;
-array_walk($roles, function (&$role) { $role = $role->name; });
+$roles = $this['roles'];
+$langs = $this['langs'];
 ?>
 <div class="widget">
-    <dl>
-        <dt>Nombre de usuario:</dt>
-        <dd><?php echo $user->name ?></dd>
-    </dl>
-    <dl>
-        <dt>Login de acceso:</dt>
-        <dd><strong><?php echo $user->id ?></strong></dd>
-    </dl>
-    <dl>
-        <dt>Email:</dt>
-        <dd><?php echo $user->email ?></dd>
-    </dl>
-    <dl>
-        <dt>Roles actuales:</dt>
-        <dd>
-            <?php echo implode(', ', $roles); ?><br />
-            <?php if (in_array('checker', array_keys($user->roles))) : ?>
-                <a href="<?php echo "/admin/users/manage/{$user->id}/nochecker"; ?>" class="button red">Quitarlo de revisor</a>
-            <?php else : ?>
-                <a href="<?php echo "/admin/users/manage/{$user->id}/checker"; ?>" class="button">Hacerlo revisor</a>
-            <?php endif; ?>
+    <table>
+        <tr>
+            <td width="140px">Nombre de usuario</td>
+            <td><a href="/user/profile/<?php echo $user->id ?>" target="_blank"><?php echo $user->name ?></a></td>
+        </tr>
+        <tr>
+            <td>Login de acceso</td>
+            <td><strong><?php echo $user->id ?></strong></td>
+        </tr>
+        <tr>
+            <td>Email</td>
+            <td><?php echo $user->email ?></td>
+        </tr>
+        <tr>
+            <td>Nodo</td>
+            <td><?php echo $this['nodes'][$user->node] ?></td>
+        </tr>
+        <tr>
+            <td>Roles actuales</td>
+            <td>
+                <?php
+                foreach ($user->roles as $role=>$roleData) {
+                    if (in_array($role, array('user', 'superadmin', 'root'))) {
+                        echo '['.$roleData->name . ']&nbsp;&nbsp;';
+                    } else {
+                        // onclick="return confirm('Se le va a quitar el rol de <?php echo $roleData->name ? > a este usuario')"
+                        ?>
+                        [<a href="/admin/users/manage/<?php echo $user->id ?>/no<?php echo $role ?>" style="color:red;text-decoration:none;"><?php echo $roleData->name ?></a>]&nbsp;&nbsp;
+                        <?php
+                    }
+                }
+                ?>
+            </td>
+        </tr>
+        <tr>
+            <td>Roles disponibles</td>
+            <td>
+                <?php
+                foreach ($roles as $roleId=>$roleName) {
+                    if (!in_array($roleId, array_keys($user->roles)) && !in_array($roleId, array('root', 'superadmin'))) {
+                        // onclick="return confirm('Se le va a dar el rol de <?php echo $roleName ? > a este usuario')"
+                        ?>
+                        <a href="/admin/users/manage/<?php echo $user->id ?>/<?php echo $roleId ?>" style="color:green;text-decoration:none;">[<?php echo $roleName ?>]</a>&nbsp;&nbsp;
+                        <?php
+                    }
+                }
+                ?>
+            </td>
+        </tr>
+        <tr>
+            <td>Estado de la cuenta</td>
+            <td>
+                <?php if ($user->active) : ?>
+                    <a href="<?php echo "/admin/users/manage/{$user->id}/ban"; ?>" style="color:green;text-decoration:none;font-weight:bold;">Activa</a>
+                <?php else : ?>
+                    <a href="<?php echo "/admin/users/manage/{$user->id}/unban"; ?>" style="color:red;text-decoration:none;font-weight:bold;">Inactiva</a>
+                <?php endif; ?>
+            </td>
+        </tr>
+        <tr>
+            <td>Visibilidad</td>
+            <td>
+                <?php if (!$user->hide) : ?>
+                    <a href="<?php echo "/admin/users/manage/{$user->id}/hide"; ?>" style="color:green;text-decoration:none;font-weight:bold;">Visible</a>
+                <?php else : ?>
+                    <a href="<?php echo "/admin/users/manage/{$user->id}/show"; ?>" style="color:red;text-decoration:none;font-weight:bold;">Oculto</a>
+                <?php endif; ?>
+            </td>
+        </tr>
+    </table>
+</div>
+<div class="widget board">
+    <ul>
+        <li><a href="/admin/users/edit/<?php echo $user->id; ?>">[Cambiar email/contraseña]</a></li>
+        <li><a href="/admin/users/move/<?php echo $user->id; ?>">[Mover a otro Nodo]</a></li>
+        <li><a href="/admin/users/impersonate/<?php echo $user->id; ?>">[Suplantar]</a></li>
+        <?php if (isset($_SESSION['admin_menu']['projects']['options']['accounts'])) : ?>
+        <li><a href="/admin/accounts/add/?user=<?php echo $user->id; ?>">[Crear aporte]</a></li>
+        <?php endif; ?>
+        <li><a href="/admin/<?php echo (isset($_SESSION['admin_node'])) ? 'invests' : 'accounts'; ?>/?name=<?php echo $user->email; ?>">[Historial aportes]</a></li>
+        <li><a href="/admin/sended/?user=<?php echo urlencode($user->email); ?>">[Historial envíos]</a></li>
+    </ul>
+
 
-            <?php if (in_array('translator', array_keys($user->roles))) : ?>
-                <a href="<?php echo "/admin/users/manage/{$user->id}/notranslator"; ?>" class="button red">Quitarlo de traductor</a>
-            <?php else : ?>
-                <a href="<?php echo "/admin/users/manage/{$user->id}/translator"; ?>" class="button">Hacerlo traductor</a>
-            <?php endif; ?>
 
-            <!--
-            <?php # if (in_array('admin', array_keys($user->roles))) : ?>
-                <a href="<?php # echo "/admin/users/manage/{$user->id}/noadmin"; ?>" class="button weak">Quitarlo de admin</a>
-            <?php # else : ?>
-                <a href="<?php # echo "/admin/users/manage/{$user->id}/admin"; ?>" class="button">Hacerlo admin</a>
-            <?php # endif; ?>
-            -->
-        </dd>
-    </dl>
-    <dl>
-        <dt>Estado de la cuenta:</dt>
-        <dd>
-            <strong><?php echo $user->active ? 'Activa' : 'Inactiva'; ?></strong>
-            <?php if ($user->active) : ?>
-                <a href="<?php echo "/admin/users/manage/{$user->id}/ban"; ?>" class="button">Desactivar</a>
-            <?php else : ?>
-                <a href="<?php echo "/admin/users/manage/{$user->id}/unban"; ?>" class="button red">Activar</a>
-            <?php endif; ?>
-        </dd>
-    </dl>
-    <dl>
-        <dt>Visibilidad:</dt>
-        <dd>
-            <strong><?php echo $user->hide ? 'Oculto' : 'Visible'; ?></strong>
-            <?php if (!$user->hide) : ?>
-                <a href="<?php echo "/admin/users/manage/{$user->id}/hide"; ?>" class="button">Ocultar</a>
-            <?php else : ?>
-                <a href="<?php echo "/admin/users/manage/{$user->id}/show"; ?>" class="button red">Mostrar</a>
-            <?php endif; ?>
-        </dd>
-    </dl>
-    <!--
-    <p>
-        <a href="<?php echo "/admin/users/manage/{$user->id}/delete"; ?>" class="button weak" onclick="return confirm('Estas seguro de que quieres eliminar este usuario y todos sus registros asociados (proyectos, mensajes, aportes...)')">Eliminar</a>
-    </p>
-    -->
 
 </div>
 
+<?php if (isset($user->roles['translator'])) : ?>
+<div class="widget board">
+    <h3>Idiomas de traductor</h3>
+    <?php if (empty($user->translangs)) : ?><p style="font-weight: bold; color:red;">¡No tiene ningún idioma asignado!</p><?php endif; ?>
+    <form method="post" action="/admin/users/translang">
+        <input type="hidden" name="user" value="<?php echo $user->id; ?>" />
+        <table>
+            <?php foreach ($langs as $lang) :
+                $chkckd = (isset($user->translangs[$lang->id])) ? ' checked="checked"' : '';
+                ?>
+            <tr>
+                <td><label><input type="checkbox" name="lang_<?php echo $lang->id; ?>" value="<?php echo $lang->id; ?>"<?php echo $chkckd; ?>/> <?php echo $lang->name; ?></label></td>
+            </tr>
+            <?php endforeach; ?>
+        </table>
+        <input type="submit" value="Aplicar">
+    </form>
+</div>
+<?php endif; ?>