Changeset 259

Timestamp:

08/01/08 16:02:37 (4 months ago)

Author:

alex

Message:

improved geoportail pages presentation (texts formatting, linked images)

Files:

• trunk/camptocamp.org/apps/frontend/lib/helper/GeoportailHelper.php (modified) (2 diffs)
• trunk/camptocamp.org/apps/frontend/modules/documents/actions/actions.class.php (modified) (1 diff)
• trunk/camptocamp.org/apps/frontend/modules/huts/templates/geoportailSuccess.php (modified) (1 diff)
• trunk/camptocamp.org/apps/frontend/modules/sites/templates/geoportailSuccess.php (modified) (1 diff)
• trunk/camptocamp.org/apps/frontend/modules/summits/templates/geoportailSuccess.php (modified) (1 diff)
• trunk/camptocamp.org/lib/model/doctrine/generated/BaseDocument.class.php (modified) (1 diff)
• trunk/camptocamp.org/plugins/sfPunBBCodeParserPlugin/lib/helper/sfBBCodeHelper.php (modified) (1 diff)
• trunk/camptocamp.org/plugins/sfPunBBCodeParserPlugin/lib/sfPunBBCodeParser.class.php (modified) (5 diffs)
• trunk/camptocamp.org/web/static/css/geoportail.css (modified) (1 diff)

trunk/camptocamp.org/apps/frontend/lib/helper/GeoportailHelper.php

@@ -1 +1 @@
-<?php
-
+, 'MyImage'
-
-function truncate_description($description, $route) {
-    $more = '... <span class="more_text">' . link_to('[Lire la suite]', $route) . '</span>';
-'<p>' . parse_links(parse_bbcode(truncate_text($description, 500, $more))) . '</p>'
+parse_links(parse_bbcode_simple(truncate_text($description, 500, $more)))
-}
-
@@ -17 +17 @@
-    return '<h3 class="gp_' . $module . '">' . $title . '</h3>';
-}
+
+function formate_thumbnail($images) {
+    if (count($images) == 0) return '';
+    
+    // take first image available
+    $image = $images[0];
+    $caption = $image['name'];
+
+    return '<div class="image">' .
+           image_tag(image_url($image['filename'], 'small'),
+                     array('alt' => $caption, 'title' => $caption)) .
+           '</div>';
+}

trunk/camptocamp.org/apps/frontend/modules/documents/actions/actions.class.php

@@ -874 +874 @@
-        $this->associated_docs = Association::findAllWithBestName($id, $prefered_cultures);
-
+        $this->associated_images = Document::fetchAdditionalFieldsFor(
+                                       array_filter($this->associated_docs, array('c2cTools', 'is_image')), 
+                                       'Image', array('filename'));
-    }
-

trunk/camptocamp.org/apps/frontend/modules/huts/templates/geoportailSuccess.php

@@ -9 +9 @@
-
-echo make_gp_title($title, 'huts');
+$image = formate_thumbnail($associated_images);
+if ($image):
-?>
+<p><?php echo $image; ?></p>
+<?php endif; ?>
-
-<ul class="data">

trunk/camptocamp.org/apps/frontend/modules/sites/templates/geoportailSuccess.php

@@ -13 +13 @@
-
-echo make_gp_title($title, 'sites');
+$image = formate_thumbnail($associated_images);
+if ($image):
-?>
+<p><?php echo $image; ?></p>
+<?php endif; ?>
-
-<ul class="data">

trunk/camptocamp.org/apps/frontend/modules/summits/templates/geoportailSuccess.php

@@ -12 +12 @@
-$description = $document->get('description');
-if (!empty($description)) {
-
+
+
+
-}
+
+$image = formate_thumbnail($associated_images);
+
+if ($description || $image):
-?>
+<p><?php echo $image . $description; ?></p>
+<?php endif; ?>
-
-<h4>Itinéraires associés :</h4>

trunk/camptocamp.org/lib/model/doctrine/generated/BaseDocument.class.php

@@ -1294 +1294 @@
-               "WHERE s.id = n.id AND s.geom IS NOT NULL AND n.culture = 'fr' " .
-               "ORDER BY n.name ASC";
+        // TODO: add filter on region
-        return sfDoctrine::connection()->standaloneQuery($sql)->fetchAll();
-    }

trunk/camptocamp.org/plugins/sfPunBBCodeParserPlugin/lib/helper/sfBBCodeHelper.php

@@ -7 +7 @@
-    return sfPunBBCodeParser::parse_message($unformatted);
-}
+
+function parse_bbcode_simple($unformatted) {
+    return sfPunBBCodeParser::parse_message_simple($unformatted);
+}

trunk/camptocamp.org/plugins/sfPunBBCodeParserPlugin/lib/sfPunBBCodeParser.class.php

@@ -187 +187 @@
-     * Truncate URL if longer than 55 characters (add http:// or ftp:// if missing)
-     */
-
+, $target = ''
-    {
-        $full_url = str_replace(array(' ', '\'', '`', '"'), array('%20', '', '', ''), $url);
@@ -200 +200 @@
-        $link = ($link == '' || $link == $url) ? ((strlen($url) > 55) ? substr($url, 0 , 39).' … '.substr($url, -10) : $url) : stripslashes($link);
-
-
+
+
+
-        if (preg_match('#^https?://'.$_SERVER['SERVER_NAME'].'#', $full_url))
-.$full_url.'">'.$link.
-.$full_url.'">'.$link.
+ . $full_url . '"' . $target . '>' . $link . 
+ . $full_url . '"' . $target . '>' . $link . 
-    }
-    
@@ -242 +244 @@
-     * Convert BBCodes to their HTML equivalent
-     */
-
+, $force_external_links = false
-    {
-        if (strpos($text, 'quote') !== false)
@@ -263 +265 @@
-                                         '<em>$1</em>',
-                                         '<span style="text-decoration: underline;">$1</span>',
-
-
+$force_external_links ? 'self::handle_url_tag(\'$1\', \'\', \'_blank\')' : 
+$force_external_links ? 'self::handle_url_tag(\'$1\', \'$2\', \'_blank\')' : 
-                                         'self::handle_email_tag(\'$1\')',
-                                         'self::handle_email_tag(\'$1\', \'$2\')',
@@ -324 +326 @@
-        return $text;
-    }
+
+    public static function parse_message_simple($text)
+    {
+        $text = self::do_bbcode($text, true);
+    
+        // remove embedded images 
+        $text = preg_replace('#\[img\](.*)\[/img\]#e', '', $text);
+    
+        // Deal with newlines, tabs and multiple spaces
+        $pattern = array( "\t", '       ', '  ');
+        $replace = array('&nbsp; &nbsp; ', '&nbsp; ', ' &nbsp;');
+        $text = str_replace($pattern, $replace, $text);
+    
+        return $text;
+    }
-}

trunk/camptocamp.org/web/static/css/geoportail.css

@@ -42 +42 @@
-}
-
+.image {
+ float:left;
+ margin-right: 5px;
+ margin-bottom: 5px;
+}
+
-#gp_logo {
- position:absolute;