]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eedfbb1)
Using correct language in html tag and putting a placeholder in the search box.
authorSem <sembrestels@riseup.net>
Thu, 14 Feb 2013 13:02:41 +0000 (14:02 +0100)
committerSem <sembrestels@riseup.net>
Thu, 14 Feb 2013 13:02:41 +0000 (14:02 +0100)
views/default/page/admin.php patch | blob | history
views/default/page/default.php patch | blob | history
views/default/page/elements/head.php patch | blob | history
views/default/page/walled_garden.php patch | blob | history
views/default/search/search_box.php [new file with mode: 0644] patch | blob

diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index 7d044909659f46ad61c58c2224f3f55ab621a69c..a6d6bf6e1c1214c589d08a7417d06e60e8179d21 100644 (file)
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -32,7 +32,7 @@ header("Content-type: text/html; charset=UTF-8");
 
 ?>
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<?php echo get_current_language(); ?>">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -63,4 +63,4 @@ header("Content-type: text/html; charset=UTF-8");
        <?php echo elgg_view('page/elements/foot'); ?>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/views/default/page/default.php b/views/default/page/default.php
index f75fa1908518c77244c4c3c2039a577b65a414e5..a0e6d4037e724868f7a6c4ea865c808eb8bc9981 100644 (file)
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -35,7 +35,7 @@ header("Content-type: text/html; charset=UTF-8");
 
 ?>
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<?php echo get_current_language(); ?>">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -71,4 +71,4 @@ header("Content-type: text/html; charset=UTF-8");
 </div>
 <?php echo elgg_view('page/elements/foot'); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index b1556b547a50706ad0184b70983b6ece4c55975a..e7951c4ff1addb4fcb3710271aa5cf5abfb9dc76 100644 (file)
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -14,7 +14,7 @@ if (empty($vars['title'])) {
 
 global $autofeed;
 if (isset($autofeed) && $autofeed == true) {
-       $url = full_url();
+       $url = current_page_url();
        if (substr_count($url,'?')) {
                $url .= "&view=rss";
        } else {
@@ -33,12 +33,10 @@ END;
 $js = elgg_get_loaded_js('head');
 $css = elgg_get_loaded_css();
 
-$version = get_version();
 $release = get_version(true);
 ?>
        <meta charset="utf-8" />
-       <meta name="ElggRelease" content="<?php echo $release; ?>" />
-       <meta name="ElggVersion" content="<?php echo $version; ?>" />
+       <meta name="generator" content="Elgg <?php echo $release; ?>" />
        <title><?php echo $title; ?></title>
        <?php echo elgg_view('page/elements/shortcut_icon', $vars); ?>
 
@@ -76,4 +74,4 @@ $metatags = elgg_view('metatags', $vars);
 if ($metatags) {
        elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8);
        echo $metatags;
-}
\ No newline at end of file
+}
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index e1d57dac8d8c1743b87eacfecdbb457414e9dd6e..77c901d8cd01fc47b266a198ff1565d8d8f78e02 100644 (file)
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -9,7 +9,7 @@
 header("Content-type: text/html; charset=UTF-8");
 ?>
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<?php echo get_current_language(); ?>">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -24,4 +24,4 @@ header("Content-type: text/html; charset=UTF-8");
 </div>
 <?php echo elgg_view('page/elements/foot'); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/views/default/search/search_box.php b/views/default/search/search_box.php
new file mode 100644 (file)
index 0000000..c1ea407
--- /dev/null
+++ b/views/default/search/search_box.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Search box
+ *
+ * @uses $vars['value'] Current search query
+ * @uses $vars['class'] Additional class
+ */
+
+if (array_key_exists('value', $vars)) {
+       $value = $vars['value'];
+} elseif ($value = get_input('q', get_input('tag', NULL))) {
+       $value = $value;
+}
+
+$class = "elgg-search";
+if (isset($vars['class'])) {
+       $class = "$class {$vars['class']}";
+}
+
+// @todo - why the strip slashes?
+$value = stripslashes($value);
+
+// @todo - create function for sanitization of strings for display in 1.8
+// encode <,>,&, quotes and characters above 127
+if (function_exists('mb_convert_encoding')) {
+       $display_query = mb_convert_encoding($value, 'HTML-ENTITIES', 'UTF-8');
+} else {
+       // if no mbstring extension, we just strip characters
+       $display_query = preg_replace("/[^\x01-\x7F]/", "", $value);
+}
+$display_query = htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);
+
+?>
+
+<form class="<?php echo $class; ?>" action="<?php echo elgg_get_site_url(); ?>search" method="get">
+       <fieldset>
+               <input type="text" class="search-input" size="21" name="q" value="<?php echo $display_query; ?>" placeholder="<?php echo elgg_echo('search'); ?>" />
+               <input type="hidden" name="search_type" value="all" />
+               <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search-submit-button" />
+       </fieldset>
+</form>
Social Networking Engine