From f53c01dcd49e2a1e974efb7b91bfe50981640b11 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Thu, 14 Mar 2013 16:49:14 +0100 Subject: Bien meilleure gestion des formulaires --- app/views/configure/categorize.phtml | 37 +++++++---- app/views/configure/display.phtml | 114 ++++++++++++++++++++------------- app/views/configure/feed.phtml | 60 +++++++++++------ app/views/configure/importExport.phtml | 24 ++++--- app/views/configure/shortcut.phtml | 97 ++++++++++++++++++---------- app/views/index/index.phtml | 2 +- app/views/javascript/main.phtml | 40 ++++++------ 7 files changed, 235 insertions(+), 139 deletions(-) (limited to 'app') diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml index 567859ea5..5d649a93a 100644 --- a/app/views/configure/categorize.phtml +++ b/app/views/configure/categorize.phtml @@ -1,18 +1,31 @@ partial ('aside_configure'); ?> -
-
-

Gérer les catégories

- +
+ + Gestion des catégories + categories as $cat) { $i++; ?> - - - +
+ +
+ + +
+
- - - - - + +
+ +
+ +
+
+ +
+
+ + +
+
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index d90f48240..bf488dbe0 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -1,53 +1,77 @@ partial ('aside_configure'); ?> -
-
-

Configuration générale

- - - - - -

+
+ + Configuration générale + +
+ +
+ mois +
+
+ +
+ conf->mailLogin (); ?> - -
- -

Configuration de l'affichage

- - - - - -
- - +
+ + +
- - - - -
- - + Configuration de l'affichage + +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+
+ + +
- -
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml index dc1d7ff96..11a194071 100644 --- a/app/views/configure/feed.phtml +++ b/app/views/configure/feed.phtml @@ -1,32 +1,52 @@ partial ('aside_feed'); ?> flux) { ?> -
+

flux->name (); ?>

flux->description (); ?> + + + Informations + +
+ +
+ flux->website (); ?> +
+
- - flux->website (); ?> +
+ +
+ flux->nbEntries (); ?> +
+
- - flux->nbEntries (); ?> + categories)) { ?> +
+ +
+ categories as $cat) { ?> + + +
+
- categories)) { ?> - -
- categories as $cat) { ?> - +
+
+ + +
+
-
- - - - - - + +
+
+ +
Aucun flux sélectionné. Pensez à en ajouter !
diff --git a/app/views/configure/importExport.phtml b/app/views/configure/importExport.phtml index d7a84df78..e660274d6 100644 --- a/app/views/configure/importExport.phtml +++ b/app/views/configure/importExport.phtml @@ -13,15 +13,23 @@ partial ('aside_configure'); ?> -
+
-

Exporter au format OPML

- - -

Importer au format OPML

- - - + Import / export au format OPML +
+ +
+ +
+
+ +
+
+ + ou + +
+
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index dd29b5f99..efc637141 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -1,6 +1,6 @@ partial ('aside_configure'); ?> -
+
list_keys as $key) { ?>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml index 995e6738a..bccb6588b 100644 --- a/app/views/index/index.phtml +++ b/app/views/index/index.phtml @@ -17,7 +17,7 @@
-
+
  • conf) || is_logged ()) { ?> diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml index 87af760d3..8eb7caf2a 100644 --- a/app/views/javascript/main.phtml +++ b/app/views/javascript/main.phtml @@ -104,7 +104,7 @@ function mark_favorite (active) { } function init_img () { - $(".post.flux .content img").each (function () { + $(".flux .content img").each (function () { if ($(this).width () > ($("#stream").width()) / 2) { $(this).addClass("big"); } @@ -115,11 +115,11 @@ function init_posts () { init_img (); if (hide_posts) { - $(".post.flux:not(.active) .content").slideUp (); + $(".flux:not(.active) .content").slideUp (); } - $(".post.flux").click (function () { - old_active = $(".post.flux.active"); + $(".flux").click (function () { + old_active = $(".flux.active"); new_active = $(this); if (old_active[0] != new_active[0]) { @@ -127,21 +127,21 @@ function init_posts () { } }); - $(".post.flux a.read").click (function () { - active = $(this).parents (".post.flux"); + $(".flux a.read").click (function () { + active = $(this).parents (".flux"); mark_read (active); return false; }); - $(".post.flux a.bookmark").click (function () { - active = $(this).parents (".post.flux"); + $(".flux a.bookmark").click (function () { + active = $(this).parents (".flux"); mark_favorite (active); return false; }); - $(".post.flux .content a").click (function () { + $(".flux .content a").click (function () { $(this).attr ('target', '_blank'); }); } @@ -152,7 +152,7 @@ $(document).ready (function () { // Touches de manipulation shortcut.add("", function () { // on marque comme lu ou non lu - active = $(".post.flux.active"); + active = $(".flux.active"); mark_read (active); }); shortcut.add("shift+", function () { @@ -162,14 +162,14 @@ $(document).ready (function () { }); shortcut.add("", function () { // on marque comme favori ou non favori - active = $(".post.flux.active"); + active = $(".flux.active"); mark_favorite (active); }); // Touches de navigation shortcut.add("", function () { - old_active = $(".post.flux.active"); - last_active = $(".post.flux:last"); + old_active = $(".flux.active"); + last_active = $(".flux:last"); new_active = old_active.prev (); if (new_active[0] instanceof HTMLDivElement) { @@ -179,16 +179,16 @@ $(document).ready (function () { } }); shortcut.add("shift+", function () { - old_active = $(".post.flux.active"); - first = $(".post.flux:first"); + old_active = $(".flux.active"); + first = $(".flux:first"); if (first[0] instanceof HTMLDivElement) { slide (first, old_active); } }); shortcut.add("", function () { - old_active = $(".post.flux.active"); - first_active = $(".post.flux:first"); + old_active = $(".flux.active"); + first_active = $(".flux:first"); new_active = old_active.next (); if (new_active[0] instanceof HTMLDivElement) { @@ -198,8 +198,8 @@ $(document).ready (function () { } }); shortcut.add("shift+", function () { - old_active = $(".post.flux.active"); - last = $(".post.flux:last"); + old_active = $(".flux.active"); + last = $(".flux:last"); if (last[0] instanceof HTMLDivElement) { slide (last, old_active); @@ -222,7 +222,7 @@ $(document).ready (function () { redirect (url, false); }); shortcut.add("", function () { - url = $(".post.flux.active .link a").attr ("href"); + url = $(".flux.active .link a").attr ("href"); redirect (url, true); }); -- cgit v1.2.3