diff --git a/app/DoctrineMigrations/Version20161128084725.php b/app/DoctrineMigrations/Version20161128084725.php index 347a4256b..242d59006 100644 --- a/app/DoctrineMigrations/Version20161128084725.php +++ b/app/DoctrineMigrations/Version20161128084725.php @@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** - * Added view_mode in user config. + * Added list_mode in user config. */ class Version20161128084725 extends AbstractMigration implements ContainerAwareInterface { @@ -33,9 +33,9 @@ class Version20161128084725 extends AbstractMigration implements ContainerAwareI public function up(Schema $schema) { $configTable = $schema->getTable($this->getTable('config')); - $this->skipIf($configTable->hasColumn('view_mode'), 'It seems that you already played this migration.'); + $this->skipIf($configTable->hasColumn('list_mode'), 'It seems that you already played this migration.'); - $configTable->addColumn('view_mode', 'integer'); + $configTable->addColumn('list_mode', 'integer'); } /** @@ -44,6 +44,6 @@ class Version20161128084725 extends AbstractMigration implements ContainerAwareI public function down(Schema $schema) { $configTable = $schema->getTable($this->getTable('config')); - $configTable->dropColumn('view_mode'); + $configTable->dropColumn('list_mode'); } } diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 6d656c213..e16846eaa 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -617,6 +617,10 @@ div.pagination ul .current { background-color: #ccc; } +.hide { + display: none; +} + /* ========================================================================== 2.1 = "save a link" related styles ========================================================================== */ @@ -1203,10 +1207,6 @@ pre code { } @media screen and (max-width: 500px) { - .hide { - display: none; - } - .entry { width: 100%; margin-left: 0; diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 76423409e..8f7b7a3dc 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -555,6 +555,14 @@ a.original { margin-right: 5px !important; } +.card-stacked:hover ul.tools-list { + display: block; +} + +.card-stacked ul.tools-list { + display: none; +} + .card .card-action a { color: #fff; margin: 0; @@ -600,7 +608,6 @@ a.original { background-position: 50%; } - /* ========================================================================== 5 = Article ========================================================================== */ diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index ea7cd883d..68f30f6e6 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -376,7 +376,7 @@ class ConfigController extends Controller public function changeViewModeAction(Request $request) { $user = $this->getUser(); - $user->getConfig()->setViewMode(!$user->getConfig()->getViewMode()); + $user->getConfig()->setListMode(!$user->getConfig()->getListMode()); $em = $this->getDoctrine()->getManager(); $em->persist($user); diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index 70364ab68..0b75270d4 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php @@ -100,9 +100,9 @@ class Config /** * @var int * - * @ORM\Column(name="view_mode", type="integer", nullable=true) + * @ORM\Column(name="list_mode", type="integer", nullable=true) */ - private $viewMode; + private $listMode; /** * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config") @@ -349,19 +349,19 @@ class Config /** * @return int */ - public function getViewMode() + public function getListMode() { - return $this->viewMode; + return $this->listMode; } /** - * @param int $viewMode + * @param int $listMode * * @return Config */ - public function setViewMode($viewMode) + public function setListMode($listMode) { - $this->viewMode = $viewMode; + $this->listMode = $listMode; return $this; } diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 338639205..a4a56e46a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -13,11 +13,11 @@ {% block content %} - {% set viewMode = app.user.config.viewMode %} + {% set listMode = app.user.config.listMode %}
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
{% for entry in entries %} -
+

{{ entry.title|raw }}

{% set readingTime = entry.readingTime / app.user.config.readingSpeed %} @@ -52,13 +52,13 @@
  • {{ 'entry.list.delete'|trans }}
  • {{ entry.domainName|removeWww }}
    • - {% if (entry.previewPicture is null or viewMode == 1) %} + {% if (entry.previewPicture is null or listMode == 1) %} -

    {{ entry.content|striptags|slice(0, 300) }}…

    +

    {{ entry.content|striptags|slice(0, 300) }}…

    {% else %}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 2921d366b..5fca53aef 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -12,11 +12,11 @@ {% endblock %} {% block content %} - {% set viewMode = app.user.config.viewMode %} + {% set listMode = app.user.config.listMode %}
    {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} - {% if viewMode == 0 %}view_list{% else %}view_module{% endif %} + {% if listMode == 0 %}view_list{% else %}view_module{% endif %}
    {% if entries.getNbPages > 1 %} {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} @@ -26,8 +26,8 @@