<?php echo $title; ?>

, and

"; + } +} else { + $header = "

$title

"; +} + +$body = "

$body

"; + +if (isset($vars['footer'])) { + if ($vars['footer']) { + $footer = ""; + } +} + +$contents = $header . $body . $footer; +if ($show_inner) { + $contents = "

$contents

"; +} + +echo "

$contents

"; diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php deleted file mode 100644 index a69f79cba..000000000 --- a/views/default/page_elements/header.php +++ /dev/null @@ -1,87 +0,0 @@ -sitename; -} else if (empty($vars['config']->sitename)) { - $title = $vars['title']; -} else { - $title = $vars['config']->sitename . ": " . $vars['title']; -} - -global $autofeed; -if (isset($autofeed) && $autofeed == true) { - $url = $url2 = full_url(); - if (substr_count($url,'?')) { - $url .= "&view=rss"; - } else { - $url .= "?view=rss"; - } - if (substr_count($url2,'?')) { - $url2 .= "&view=odd"; - } else { - $url2 .= "?view=opendd"; - } - $feedref = << - - -END; -} else { - $feedref = ""; -} - -// we won't trust server configuration but specify utf-8 -header('Content-type: text/html; charset=utf-8'); - -$version = get_version(); -$release = get_version(true); -?> - - - - - - - <?php echo $title; ?> - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From ba3410e1ed5b8a23214b14f0fd0ce8c55c35391d Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Sat, 19 Mar 2011 13:57:35 -0700 Subject: Valid manifest --- manifest.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.xml b/manifest.xml index a5399845a..de132dc05 100644 --- a/manifest.xml +++ b/manifest.xml @@ -4,5 +4,9 @@ 1.0 Provides HTML5 support for Elgg (C) Evan Winslow 2010 - http://code.google.com/p/elgg-ewinslow + http://github.com/ewinslow/elgg-html5 + + elgg_version + 2011031400 + \ No newline at end of file -- cgit v1.2.3 From 1b1908d4c05392d07b0a0af086a567cbc53606ba Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Thu, 19 May 2011 15:59:07 -0700 Subject: Cleaned up all the input views --- views/default/input/color.php | 13 ++++++++++++- views/default/input/datetime-local.php | 10 +++++++++- views/default/input/datetime.php | 11 ++++++++++- views/default/input/email.php | 13 ++++++++++++- views/default/input/image.php | 12 +++++++++++- views/default/input/month.php | 11 ++++++++++- views/default/input/number.php | 12 +++++++++++- views/default/input/range.php | 7 +++++-- views/default/input/search.php | 7 +++++-- views/default/input/tel.php | 7 +++++-- views/default/input/time.php | 7 +++++-- views/default/input/url.php | 7 +++++-- views/default/input/week.php | 9 ++++++--- 13 files changed, 106 insertions(+), 20 deletions(-) diff --git a/views/default/input/color.php b/views/default/input/color.php index 8bc4ad2a3..be8154fc9 100644 --- a/views/default/input/color.php +++ b/views/default/input/color.php @@ -1 +1,12 @@ - /> \ No newline at end of file + 'elgg-input-color', +); + +$vars = array_merge($defaults, $vars); + +$vars['type'] = 'color'; + +?> + + /> \ No newline at end of file diff --git a/views/default/input/datetime-local.php b/views/default/input/datetime-local.php index 52902f543..468843901 100644 --- a/views/default/input/datetime-local.php +++ b/views/default/input/datetime-local.php @@ -1,6 +1,14 @@ 'elgg-input-datetime-local', +); + +$vars = array_merge($defaults, $vars); + if (isset($vars['value']) && is_int($vars['value'])) { $vars['value'] = date("Y-m-d\TH:i:s", $vars['value']); } + +$vars['type'] = 'datetime-local'; ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/datetime.php b/views/default/input/datetime.php index 61262f234..69e4bd7f7 100644 --- a/views/default/input/datetime.php +++ b/views/default/input/datetime.php @@ -1,6 +1,15 @@ 'elgg-input-datetime', +); + +$vars = array_merge($defaults, $vars); + if (isset($vars['value']) && is_int($vars['value'])) { $vars['value'] = date("c", $vars['value']); } + +$vars['type'] = 'datetime'; + ?> - /> + /> diff --git a/views/default/input/email.php b/views/default/input/email.php index 15e36f145..de98d9c4f 100644 --- a/views/default/input/email.php +++ b/views/default/input/email.php @@ -1 +1,12 @@ - /> \ No newline at end of file + 'elgg-input-email', +); + +$vars = array_merge($defaults, $vars); + +$vars['type'] = 'email'; + +?> + + /> \ No newline at end of file diff --git a/views/default/input/image.php b/views/default/input/image.php index bb6a44045..cf740f782 100644 --- a/views/default/input/image.php +++ b/views/default/input/image.php @@ -1 +1,11 @@ - /> \ No newline at end of file + 'elgg-input-image', +); + +$vars = array_merge($defaults, $vars); + +$vars['type'] = 'image'; + +?> + /> \ No newline at end of file diff --git a/views/default/input/month.php b/views/default/input/month.php index 4eaf91048..c99b3f34c 100644 --- a/views/default/input/month.php +++ b/views/default/input/month.php @@ -1,7 +1,16 @@ 'elgg-input-month', +); + +$vars = array_merge($defaults, $vars); + if (isset($vars['value']) && is_int($vars['value'])) { $vars['value'] = date("Y-m", $vars['value']); } + +$vars['type'] = 'month'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/number.php b/views/default/input/number.php index 908e9382e..ec4938734 100644 --- a/views/default/input/number.php +++ b/views/default/input/number.php @@ -1 +1,11 @@ - /> \ No newline at end of file + 'elgg-input-number', +); + +$vars = array_merge($defaults, $vars); + +$vars['type'] = 'number'; + +?> + /> \ No newline at end of file diff --git a/views/default/input/range.php b/views/default/input/range.php index 8d4d7f13d..235687257 100644 --- a/views/default/input/range.php +++ b/views/default/input/range.php @@ -1,10 +1,13 @@ 'elgg-input-range', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'range'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/search.php b/views/default/input/search.php index 29adba5fc..becf8a11b 100644 --- a/views/default/input/search.php +++ b/views/default/input/search.php @@ -1,10 +1,13 @@ elgg_echo('placeholder:search'), + 'class' => 'elgg-input-search', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'search'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/tel.php b/views/default/input/tel.php index 329554501..0704344a8 100644 --- a/views/default/input/tel.php +++ b/views/default/input/tel.php @@ -1,9 +1,12 @@ elgg_echo('placeholder:tel'), + 'class' => 'elgg-input-tel', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'tel'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/time.php b/views/default/input/time.php index 58c8b0928..6bb557266 100644 --- a/views/default/input/time.php +++ b/views/default/input/time.php @@ -1,10 +1,13 @@ elgg_echo('placeholder:time'), + 'class' => 'elgg-input-time', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'time'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/url.php b/views/default/input/url.php index d42d7c056..ed3cd08a2 100644 --- a/views/default/input/url.php +++ b/views/default/input/url.php @@ -1,10 +1,13 @@ elgg_echo('placeholder:url'), + 'class' => 'elgg-input-url', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'url'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file diff --git a/views/default/input/week.php b/views/default/input/week.php index 59cf5d7f1..3d09ba07f 100644 --- a/views/default/input/week.php +++ b/views/default/input/week.php @@ -1,10 +1,13 @@ elgg_echo('placeholder:week'), +$defaults = array( + 'class' => 'elgg-input-week', ); $vars = array_merge($defaults, $vars); + +$vars['type'] = 'week'; + ?> - /> \ No newline at end of file + /> \ No newline at end of file -- cgit v1.2.3 From c5ed6305bfc47d7e4296bbc71df03a6cc21ab3d8 Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Thu, 19 May 2011 16:03:34 -0700 Subject: Removed override of core view -- don't want to have to keep up with any updates. Also, outside of scope of this theme to transform a site into using html5 -- hopefully Elgg core would adopt this eventually. --- views/default/page/components/module.php | 52 -------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 views/default/page/components/module.php diff --git a/views/default/page/components/module.php b/views/default/page/components/module.php deleted file mode 100644 index eb5789bdb..000000000 --- a/views/default/page/components/module.php +++ /dev/null @@ -1,52 +0,0 @@ -$header"; - } -} else { - $header = "

$title

"; -} - -$body = "

$body

"; - -if (isset($vars['footer'])) { - if ($vars['footer']) { - $footer = ""; - } -} - -$contents = $header . $body . $footer; -if ($show_inner) { - $contents = "

$contents

"; -} - -echo "

$contents

"; -- cgit v1.2.3 From 72fc1afa98e78c67baafdd5b777a5878c9607daf Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Thu, 19 May 2011 16:04:04 -0700 Subject: Updated manifest file to include the required "name" tag --- manifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.xml b/manifest.xml index de132dc05..010d2ab1c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,5 +1,6 @@ + HTML5 Evan Winslow 1.0 Provides HTML5 support for Elgg -- cgit v1.2.3 From 888751ed186a8312fa482ae41a91eed0f8786d2b Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Thu, 19 May 2011 16:04:19 -0700 Subject: Moved 3rd party javascripts to a vendors folder --- js/Modernizr-1.5.min.js | 28 --------------- js/jquery.placeholder-1.0.1.js | 58 ------------------------------ start.php | 6 ++-- vendors/Modernizr-1.5.min.js | 28 +++++++++++++++ vendors/jquery/jquery.placeholder-1.0.1.js | 58 ++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 js/Modernizr-1.5.min.js delete mode 100644 js/jquery.placeholder-1.0.1.js create mode 100644 vendors/Modernizr-1.5.min.js create mode 100644 vendors/jquery/jquery.placeholder-1.0.1.js diff --git a/js/Modernizr-1.5.min.js b/js/Modernizr-1.5.min.js deleted file mode 100644 index a8dc724e6..000000000 --- a/js/Modernizr-1.5.min.js +++ /dev/null @@ -1,28 +0,0 @@ -/*! - * Modernizr JavaScript library 1.5 - * http://www.modernizr.com/ - * - * Copyright (c) 2009-2010 Faruk Ates - http://farukat.es/ - * Dual-licensed under the BSD and MIT licenses. - * http://www.modernizr.com/license/ - * - * Featuring major contributions by - * Paul Irish - http://paulirish.com - */ - window.Modernizr=function(i,e,I){function C(a,b){for(var c in a)if(m[a[c]]!==I&&(!b||b(a[c],D)))return true}function r(a,b){var c=a.charAt(0).toUpperCase()+a.substr(1);return!!C([a,"Webkit"+c,"Moz"+c,"O"+c,"ms"+c,"Khtml"+c],b)}function P(){j[E]=function(a){for(var b=0,c=a.length;b7)};d.historymanagement=function(){return!!(i.history&&history.pushState)};d.draganddrop=function(){return u("drag")&&u("dragstart")&&u("dragenter")&&u("dragover")&&u("dragleave")&&u("dragend")&&u("drop")};d.websockets=function(){return"WebSocket"in i};d.rgba=function(){m.cssText="background-color:rgba(150,255,150,.5)";return(""+m.backgroundColor).indexOf("rgba")!==-1};d.hsla=function(){m.cssText="background-color:hsla(120,40%,100%,.5)";return(""+ - m.backgroundColor).indexOf("rgba")!==-1};d.multiplebgs=function(){m.cssText="background:url(//:),url(//:),red url(//:)";return/(url\s*\(.*?){3}/.test(m.background)};d.backgroundsize=function(){return r("backgroundSize")};d.borderimage=function(){return r("borderImage")};d.borderradius=function(){return r("borderRadius","",function(a){return(""+a).indexOf("orderRadius")!==-1})};d.boxshadow=function(){return r("boxShadow")};d.opacity=function(){var a=y.join("opacity:.5;")+"";m.cssText=a;return(""+m.opacity).indexOf("0.5")!== - -1};d.cssanimations=function(){return r("animationName")};d.csscolumns=function(){return r("columnCount")};d.cssgradients=function(){var a=("background-image:"+y.join("gradient(linear,left top,right bottom,from(#9f9),to(white));background-image:")+y.join("linear-gradient(left top,#9f9, white);background-image:")).slice(0,-17);m.cssText=a;return(""+m.backgroundImage).indexOf("gradient")!==-1};d.cssreflections=function(){return r("boxReflect")};d.csstransforms=function(){return!!C(["transformProperty", - "WebkitTransform","MozTransform","OTransform","msTransform"])};d.csstransforms3d=function(){var a=!!C(["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"]);if(a){var b=document.createElement("style"),c=e.createElement("div");b.textContent="@media ("+y.join("transform-3d),(")+"modernizr){#modernizr{height:3px}}";e.getElementsByTagName("head")[0].appendChild(b);c.id="modernizr";s.appendChild(c);a=c.offsetHeight===3;b.parentNode.removeChild(b);c.parentNode.removeChild(c)}return a}; - d.csstransitions=function(){return r("transitionProperty")};d.fontface=function(){var a;if(/*@cc_on@if(@_jscript_version>=5)!@end@*/0)a=true;else{var b=e.createElement("style"),c=e.createElement("span"),h,t=false,g=e.body,o,w;b.textContent="@font-face{font-family:testfont;src:url('data:font/ttf;base64,AAEAAAAMAIAAAwBAT1MvMliohmwAAADMAAAAVmNtYXCp5qrBAAABJAAAANhjdnQgACICiAAAAfwAAAAEZ2FzcP//AAMAAAIAAAAACGdseWYv5OZoAAACCAAAANxoZWFk69bnvwAAAuQAAAA2aGhlYQUJAt8AAAMcAAAAJGhtdHgGDgC4AAADQAAAABRsb2NhAIQAwgAAA1QAAAAMbWF4cABVANgAAANgAAAAIG5hbWUgXduAAAADgAAABPVwb3N03NkzmgAACHgAAAA4AAECBAEsAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAACAAMDAAAAAAAAgAACbwAAAAoAAAAAAAAAAFBmRWQAAAAgqS8DM/8zAFwDMwDNAAAABQAAAAAAAAAAAAMAAAADAAAAHAABAAAAAABGAAMAAQAAAK4ABAAqAAAABgAEAAEAAgAuqQD//wAAAC6pAP///9ZXAwAAAAAAAAACAAAABgBoAAAAAAAvAAEAAAAAAAAAAAAAAAAAAAABAAIAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEACoAAAAGAAQAAQACAC6pAP//AAAALqkA////1lcDAAAAAAAAAAIAAAAiAogAAAAB//8AAgACACIAAAEyAqoAAwAHAC6xAQAvPLIHBADtMrEGBdw8sgMCAO0yALEDAC88sgUEAO0ysgcGAfw8sgECAO0yMxEhESczESMiARDuzMwCqv1WIgJmAAACAFUAAAIRAc0ADwAfAAATFRQWOwEyNj0BNCYrASIGARQGKwEiJj0BNDY7ATIWFX8aIvAiGhoi8CIaAZIoN/43KCg3/jcoAWD0JB4eJPQkHh7++EY2NkbVRjY2RgAAAAABAEH/+QCdAEEACQAANjQ2MzIWFAYjIkEeEA8fHw8QDxwWFhwWAAAAAQAAAAIAAIuYbWpfDzz1AAsEAAAAAADFn9IuAAAAAMWf0i797/8zA4gDMwAAAAgAAgAAAAAAAAABAAADM/8zAFwDx/3v/98DiAABAAAAAAAAAAAAAAAAAAAABQF2ACIAAAAAAVUAAAJmAFUA3QBBAAAAKgAqACoAWgBuAAEAAAAFAFAABwBUAAQAAgAAAAEAAQAAAEAALgADAAMAAAAQAMYAAQAAAAAAAACLAAAAAQAAAAAAAQAhAIsAAQAAAAAAAgAFAKwAAQAAAAAAAwBDALEAAQAAAAAABAAnAPQAAQAAAAAABQAKARsAAQAAAAAABgAmASUAAQAAAAAADgAaAUsAAwABBAkAAAEWAWUAAwABBAkAAQBCAnsAAwABBAkAAgAKAr0AAwABBAkAAwCGAscAAwABBAkABABOA00AAwABBAkABQAUA5sAAwABBAkABgBMA68AAwABBAkADgA0A/tDb3B5cmlnaHQgMjAwOSBieSBEYW5pZWwgSm9obnNvbi4gIFJlbGVhc2VkIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgT3BlbiBGb250IExpY2Vuc2UuIEtheWFoIExpIGdseXBocyBhcmUgcmVsZWFzZWQgdW5kZXIgdGhlIEdQTCB2ZXJzaW9uIDMuYmFlYzJhOTJiZmZlNTAzMiAtIHN1YnNldCBvZiBKdXJhTGlnaHRiYWVjMmE5MmJmZmU1MDMyIC0gc3Vic2V0IG9mIEZvbnRGb3JnZSAyLjAgOiBKdXJhIExpZ2h0IDogMjMtMS0yMDA5YmFlYzJhOTJiZmZlNTAzMiAtIHN1YnNldCBvZiBKdXJhIExpZ2h0VmVyc2lvbiAyIGJhZWMyYTkyYmZmZTUwMzIgLSBzdWJzZXQgb2YgSnVyYUxpZ2h0aHR0cDovL3NjcmlwdHMuc2lsLm9yZy9PRkwAQwBvAHAAeQByAGkAZwBoAHQAIAAyADAAMAA5ACAAYgB5ACAARABhAG4AaQBlAGwAIABKAG8AaABuAHMAbwBuAC4AIAAgAFIAZQBsAGUAYQBzAGUAZAAgAHUAbgBkAGUAcgAgAHQAaABlACAAdABlAHIAbQBzACAAbwBmACAAdABoAGUAIABPAHAAZQBuACAARgBvAG4AdAAgAEwAaQBjAGUAbgBzAGUALgAgAEsAYQB5AGEAaAAgAEwAaQAgAGcAbAB5AHAAaABzACAAYQByAGUAIAByAGUAbABlAGEAcwBlAGQAIAB1AG4AZABlAHIAIAB0AGgAZQAgAEcAUABMACAAdgBlAHIAcwBpAG8AbgAgADMALgBiAGEAZQBjADIAYQA5ADIAYgBmAGYAZQA1ADAAMwAyACAALQAgAHMAdQBiAHMAZQB0ACAAbwBmACAASgB1AHIAYQBMAGkAZwBoAHQAYgBhAGUAYwAyAGEAOQAyAGIAZgBmAGUANQAwADMAMgAgAC0AIABzAHUAYgBzAGUAdAAgAG8AZgAgAEYAbwBuAHQARgBvAHIAZwBlACAAMgAuADAAIAA6ACAASgB1AHIAYQAgAEwAaQBnAGgAdAAgADoAIAAyADMALQAxAC0AMgAwADAAOQBiAGEAZQBjADIAYQA5ADIAYgBmAGYAZQA1ADAAMwAyACAALQAgAHMAdQBiAHMAZQB0ACAAbwBmACAASgB1AHIAYQAgAEwAaQBnAGgAdABWAGUAcgBzAGkAbwBuACAAMgAgAGIAYQBlAGMAMgBhADkAMgBiAGYAZgBlADUAMAAzADIAIAAtACAAcwB1AGIAcwBlAHQAIABvAGYAIABKAHUAcgBhAEwAaQBnAGgAdABoAHQAdABwADoALwAvAHMAYwByAGkAcAB0AHMALgBzAGkAbAAuAG8AcgBnAC8ATwBGAEwAAAAAAgAAAAAAAP+BADMAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAQACAQIAEQt6ZXJva2F5YWhsaQ==')}"; - e.getElementsByTagName("head")[0].appendChild(b);c.setAttribute("style","font:99px _,arial,helvetica;position:absolute;visibility:hidden");if(!g){g=s.appendChild(e.createElement("fontface"));t=true}c.innerHTML="........";c.id="fonttest";g.appendChild(c);h=c.offsetWidth*c.offsetHeight;c.style.font="99px testfont,_,arial,helvetica";a=h!==c.offsetWidth*c.offsetHeight;var v=function(){if(g.parentNode){a=j.fontface=h!==c.offsetWidth*c.offsetHeight;s.className=s.className.replace(/(no-)?fontface\b/,"")+ - (a?" ":" no-")+"fontface"}};setTimeout(v,75);setTimeout(v,150);addEventListener("load",function(){v();(w=true)&&o&&o(a);setTimeout(function(){t||(g=c);g.parentNode.removeChild(g);b.parentNode.removeChild(b)},50)},false)}j._fontfaceready=function(p){w||a?p(a):(o=p)};return a||h!==c.offsetWidth};d.video=function(){var a=e.createElement("video"),b=!!a.canPlayType;if(b){b=new Boolean(b);b.ogg=a.canPlayType('video/ogg; codecs="theora"');b.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"');b.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"')}return b}; - d.audio=function(){var a=e.createElement("audio"),b=!!a.canPlayType;if(b){b=new Boolean(b);b.ogg=a.canPlayType('audio/ogg; codecs="vorbis"');b.mp3=a.canPlayType("audio/mpeg;");b.wav=a.canPlayType('audio/wav; codecs="1"');b.m4a=a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")}return b};d.localStorage=function(){return"localStorage"in i&&i.localStorage!==null};d.sessionStorage=function(){try{return"sessionStorage"in i&&i.sessionStorage!==null}catch(a){return false}};d.webworkers=function(){return!!i.Worker}; - d.applicationCache=function(){var a=i.applicationCache;return!!(a&&typeof a.status!="undefined"&&typeof a.update=="function"&&typeof a.swapCache=="function")};d.svg=function(){return!!e.createElementNS&&!!e.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect};d.smil=function(){return!!e.createElementNS&&/SVG/.test(M.call(e.createElementNS("http://www.w3.org/2000/svg","animate")))};d.svgclippaths=function(){return!!e.createElementNS&&/SVG/.test(M.call(e.createElementNS("http://www.w3.org/2000/svg", - "clipPath")))};for(var z in d)if(O(d,z))N.push(((j[z.toLowerCase()]=d[z]())?"":"no-")+z.toLowerCase());j[E]||P();j.addTest=function(a,b){a=a.toLowerCase();if(!j[a]){b=!!b();s.className+=" "+(b?"":"no-")+a;j[a]=b;return j}};m.cssText="";D=n=null;(function(){var a=e.createElement("div");a.innerHTML="";return a.childNodes.length!==1})()&&function(a,b){function c(f,k){if(o[f])o[f].styleSheet.cssText+=k;else{var l=t[G],q=b[A]("style");q.media=f;l.insertBefore(q,l[G]);o[f]=q;c(f,k)}}function h(f, - k){for(var l=new RegExp("\\b("+w+")\\b(?!.*[;}])","gi"),q=function(B){return".iepp_"+B},x=-1;++x\\s*$","i");g.innerHTML=f.outerHTML.replace(/\r|\n/g," ").replace(l,f.currentStyle.display=="block"?"":"");l=g.childNodes[0];l.className+=" iepp_"+q;l=p[p.length]=[f,l];f.parentNode.replaceChild(l[1],l[0])}h(b.styleSheets,"all")});a.attachEvent("onafterprint", - function(){for(var f=-1,k;++f7)};d.historymanagement=function(){return!!(i.history&&history.pushState)};d.draganddrop=function(){return u("drag")&&u("dragstart")&&u("dragenter")&&u("dragover")&&u("dragleave")&&u("dragend")&&u("drop")};d.websockets=function(){return"WebSocket"in i};d.rgba=function(){m.cssText="background-color:rgba(150,255,150,.5)";return(""+m.backgroundColor).indexOf("rgba")!==-1};d.hsla=function(){m.cssText="background-color:hsla(120,40%,100%,.5)";return(""+ + m.backgroundColor).indexOf("rgba")!==-1};d.multiplebgs=function(){m.cssText="background:url(//:),url(//:),red url(//:)";return/(url\s*\(.*?){3}/.test(m.background)};d.backgroundsize=function(){return r("backgroundSize")};d.borderimage=function(){return r("borderImage")};d.borderradius=function(){return r("borderRadius","",function(a){return(""+a).indexOf("orderRadius")!==-1})};d.boxshadow=function(){return r("boxShadow")};d.opacity=function(){var a=y.join("opacity:.5;")+"";m.cssText=a;return(""+m.opacity).indexOf("0.5")!== + -1};d.cssanimations=function(){return r("animationName")};d.csscolumns=function(){return r("columnCount")};d.cssgradients=function(){var a=("background-image:"+y.join("gradient(linear,left top,right bottom,from(#9f9),to(white));background-image:")+y.join("linear-gradient(left top,#9f9, white);background-image:")).slice(0,-17);m.cssText=a;return(""+m.backgroundImage).indexOf("gradient")!==-1};d.cssreflections=function(){return r("boxReflect")};d.csstransforms=function(){return!!C(["transformProperty", + "WebkitTransform","MozTransform","OTransform","msTransform"])};d.csstransforms3d=function(){var a=!!C(["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"]);if(a){var b=document.createElement("style"),c=e.createElement("div");b.textContent="@media ("+y.join("transform-3d),(")+"modernizr){#modernizr{height:3px}}";e.getElementsByTagName("head")[0].appendChild(b);c.id="modernizr";s.appendChild(c);a=c.offsetHeight===3;b.parentNode.removeChild(b);c.parentNode.removeChild(c)}return a}; + d.csstransitions=function(){return r("transitionProperty")};d.fontface=function(){var a;if(/*@cc_on@if(@_jscript_version>=5)!@end@*/0)a=true;else{var b=e.createElement("style"),c=e.createElement("span"),h,t=false,g=e.body,o,w;b.textContent="@font-face{font-family:testfont;src:url('data:font/ttf;base64,AAEAAAAMAIAAAwBAT1MvMliohmwAAADMAAAAVmNtYXCp5qrBAAABJAAAANhjdnQgACICiAAAAfwAAAAEZ2FzcP//AAMAAAIAAAAACGdseWYv5OZoAAACCAAAANxoZWFk69bnvwAAAuQAAAA2aGhlYQUJAt8AAAMcAAAAJGhtdHgGDgC4AAADQAAAABRsb2NhAIQAwgAAA1QAAAAMbWF4cABVANgAAANgAAAAIG5hbWUgXduAAAADgAAABPVwb3N03NkzmgAACHgAAAA4AAECBAEsAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAACAAMDAAAAAAAAgAACbwAAAAoAAAAAAAAAAFBmRWQAAAAgqS8DM/8zAFwDMwDNAAAABQAAAAAAAAAAAAMAAAADAAAAHAABAAAAAABGAAMAAQAAAK4ABAAqAAAABgAEAAEAAgAuqQD//wAAAC6pAP///9ZXAwAAAAAAAAACAAAABgBoAAAAAAAvAAEAAAAAAAAAAAAAAAAAAAABAAIAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEACoAAAAGAAQAAQACAC6pAP//AAAALqkA////1lcDAAAAAAAAAAIAAAAiAogAAAAB//8AAgACACIAAAEyAqoAAwAHAC6xAQAvPLIHBADtMrEGBdw8sgMCAO0yALEDAC88sgUEAO0ysgcGAfw8sgECAO0yMxEhESczESMiARDuzMwCqv1WIgJmAAACAFUAAAIRAc0ADwAfAAATFRQWOwEyNj0BNCYrASIGARQGKwEiJj0BNDY7ATIWFX8aIvAiGhoi8CIaAZIoN/43KCg3/jcoAWD0JB4eJPQkHh7++EY2NkbVRjY2RgAAAAABAEH/+QCdAEEACQAANjQ2MzIWFAYjIkEeEA8fHw8QDxwWFhwWAAAAAQAAAAIAAIuYbWpfDzz1AAsEAAAAAADFn9IuAAAAAMWf0i797/8zA4gDMwAAAAgAAgAAAAAAAAABAAADM/8zAFwDx/3v/98DiAABAAAAAAAAAAAAAAAAAAAABQF2ACIAAAAAAVUAAAJmAFUA3QBBAAAAKgAqACoAWgBuAAEAAAAFAFAABwBUAAQAAgAAAAEAAQAAAEAALgADAAMAAAAQAMYAAQAAAAAAAACLAAAAAQAAAAAAAQAhAIsAAQAAAAAAAgAFAKwAAQAAAAAAAwBDALEAAQAAAAAABAAnAPQAAQAAAAAABQAKARsAAQAAAAAABgAmASUAAQAAAAAADgAaAUsAAwABBAkAAAEWAWUAAwABBAkAAQBCAnsAAwABBAkAAgAKAr0AAwABBAkAAwCGAscAAwABBAkABABOA00AAwABBAkABQAUA5sAAwABBAkABgBMA68AAwABBAkADgA0A/tDb3B5cmlnaHQgMjAwOSBieSBEYW5pZWwgSm9obnNvbi4gIFJlbGVhc2VkIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgT3BlbiBGb250IExpY2Vuc2UuIEtheWFoIExpIGdseXBocyBhcmUgcmVsZWFzZWQgdW5kZXIgdGhlIEdQTCB2ZXJzaW9uIDMuYmFlYzJhOTJiZmZlNTAzMiAtIHN1YnNldCBvZiBKdXJhTGlnaHRiYWVjMmE5MmJmZmU1MDMyIC0gc3Vic2V0IG9mIEZvbnRGb3JnZSAyLjAgOiBKdXJhIExpZ2h0IDogMjMtMS0yMDA5YmFlYzJhOTJiZmZlNTAzMiAtIHN1YnNldCBvZiBKdXJhIExpZ2h0VmVyc2lvbiAyIGJhZWMyYTkyYmZmZTUwMzIgLSBzdWJzZXQgb2YgSnVyYUxpZ2h0aHR0cDovL3NjcmlwdHMuc2lsLm9yZy9PRkwAQwBvAHAAeQByAGkAZwBoAHQAIAAyADAAMAA5ACAAYgB5ACAARABhAG4AaQBlAGwAIABKAG8AaABuAHMAbwBuAC4AIAAgAFIAZQBsAGUAYQBzAGUAZAAgAHUAbgBkAGUAcgAgAHQAaABlACAAdABlAHIAbQBzACAAbwBmACAAdABoAGUAIABPAHAAZQBuACAARgBvAG4AdAAgAEwAaQBjAGUAbgBzAGUALgAgAEsAYQB5AGEAaAAgAEwAaQAgAGcAbAB5AHAAaABzACAAYQByAGUAIAByAGUAbABlAGEAcwBlAGQAIAB1AG4AZABlAHIAIAB0AGgAZQAgAEcAUABMACAAdgBlAHIAcwBpAG8AbgAgADMALgBiAGEAZQBjADIAYQA5ADIAYgBmAGYAZQA1ADAAMwAyACAALQAgAHMAdQBiAHMAZQB0ACAAbwBmACAASgB1AHIAYQBMAGkAZwBoAHQAYgBhAGUAYwAyAGEAOQAyAGIAZgBmAGUANQAwADMAMgAgAC0AIABzAHUAYgBzAGUAdAAgAG8AZgAgAEYAbwBuAHQARgBvAHIAZwBlACAAMgAuADAAIAA6ACAASgB1AHIAYQAgAEwAaQBnAGgAdAAgADoAIAAyADMALQAxAC0AMgAwADAAOQBiAGEAZQBjADIAYQA5ADIAYgBmAGYAZQA1ADAAMwAyACAALQAgAHMAdQBiAHMAZQB0ACAAbwBmACAASgB1AHIAYQAgAEwAaQBnAGgAdABWAGUAcgBzAGkAbwBuACAAMgAgAGIAYQBlAGMAMgBhADkAMgBiAGYAZgBlADUAMAAzADIAIAAtACAAcwB1AGIAcwBlAHQAIABvAGYAIABKAHUAcgBhAEwAaQBnAGgAdABoAHQAdABwADoALwAvAHMAYwByAGkAcAB0AHMALgBzAGkAbAAuAG8AcgBnAC8ATwBGAEwAAAAAAgAAAAAAAP+BADMAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAAQACAQIAEQt6ZXJva2F5YWhsaQ==')}"; + e.getElementsByTagName("head")[0].appendChild(b);c.setAttribute("style","font:99px _,arial,helvetica;position:absolute;visibility:hidden");if(!g){g=s.appendChild(e.createElement("fontface"));t=true}c.innerHTML="........";c.id="fonttest";g.appendChild(c);h=c.offsetWidth*c.offsetHeight;c.style.font="99px testfont,_,arial,helvetica";a=h!==c.offsetWidth*c.offsetHeight;var v=function(){if(g.parentNode){a=j.fontface=h!==c.offsetWidth*c.offsetHeight;s.className=s.className.replace(/(no-)?fontface\b/,"")+ + (a?" ":" no-")+"fontface"}};setTimeout(v,75);setTimeout(v,150);addEventListener("load",function(){v();(w=true)&&o&&o(a);setTimeout(function(){t||(g=c);g.parentNode.removeChild(g);b.parentNode.removeChild(b)},50)},false)}j._fontfaceready=function(p){w||a?p(a):(o=p)};return a||h!==c.offsetWidth};d.video=function(){var a=e.createElement("video"),b=!!a.canPlayType;if(b){b=new Boolean(b);b.ogg=a.canPlayType('video/ogg; codecs="theora"');b.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"');b.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"')}return b}; + d.audio=function(){var a=e.createElement("audio"),b=!!a.canPlayType;if(b){b=new Boolean(b);b.ogg=a.canPlayType('audio/ogg; codecs="vorbis"');b.mp3=a.canPlayType("audio/mpeg;");b.wav=a.canPlayType('audio/wav; codecs="1"');b.m4a=a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")}return b};d.localStorage=function(){return"localStorage"in i&&i.localStorage!==null};d.sessionStorage=function(){try{return"sessionStorage"in i&&i.sessionStorage!==null}catch(a){return false}};d.webworkers=function(){return!!i.Worker}; + d.applicationCache=function(){var a=i.applicationCache;return!!(a&&typeof a.status!="undefined"&&typeof a.update=="function"&&typeof a.swapCache=="function")};d.svg=function(){return!!e.createElementNS&&!!e.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect};d.smil=function(){return!!e.createElementNS&&/SVG/.test(M.call(e.createElementNS("http://www.w3.org/2000/svg","animate")))};d.svgclippaths=function(){return!!e.createElementNS&&/SVG/.test(M.call(e.createElementNS("http://www.w3.org/2000/svg", + "clipPath")))};for(var z in d)if(O(d,z))N.push(((j[z.toLowerCase()]=d[z]())?"":"no-")+z.toLowerCase());j[E]||P();j.addTest=function(a,b){a=a.toLowerCase();if(!j[a]){b=!!b();s.className+=" "+(b?"":"no-")+a;j[a]=b;return j}};m.cssText="";D=n=null;(function(){var a=e.createElement("div");a.innerHTML="";return a.childNodes.length!==1})()&&function(a,b){function c(f,k){if(o[f])o[f].styleSheet.cssText+=k;else{var l=t[G],q=b[A]("style");q.media=f;l.insertBefore(q,l[G]);o[f]=q;c(f,k)}}function h(f, + k){for(var l=new RegExp("\\b("+w+")\\b(?!.*[;}])","gi"),q=function(B){return".iepp_"+B},x=-1;++x\\s*$","i");g.innerHTML=f.outerHTML.replace(/\r|\n/g," ").replace(l,f.currentStyle.display=="block"?"":"");l=g.childNodes[0];l.className+=" iepp_"+q;l=p[p.length]=[f,l];f.parentNode.replaceChild(l[1],l[0])}h(b.styleSheets,"all")});a.attachEvent("onafterprint", + function(){for(var f=-1,k;++f Date: Thu, 19 May 2011 16:07:44 -0700 Subject: Updated manifest, added README --- README | 7 +++++++ manifest.xml | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 README diff --git a/README b/README new file mode 100644 index 000000000..29e8181b9 --- /dev/null +++ b/README @@ -0,0 +1,7 @@ +# HTML5 Plugin for Elgg # +Provides several javascript libraries + views that allow developers to start using HTML5 features in Elgg today. + +## Features ## +* HTML5 input views +* Modernizr javascript library for easy html5 feature detection +* Javascript shim for the placeholder attribute \ No newline at end of file diff --git a/manifest.xml b/manifest.xml index 010d2ab1c..3f874d3bf 100644 --- a/manifest.xml +++ b/manifest.xml @@ -3,7 +3,9 @@ HTML5 Evan Winslow 1.0 - Provides HTML5 support for Elgg + + Provides several javascript libraries + views that allow developers to start using HTML5 features in Elgg today. + (C) Evan Winslow 2010 http://github.com/ewinslow/elgg-html5 -- cgit v1.2.3 From eba13eb88fb8d16d94c93c113e7c136c7559881b Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Thu, 19 May 2011 16:19:46 -0700 Subject: Deleted some unnecessary inputs, added theme previews for all new inputs --- start.php | 1 + views/default/html5/theme_preview/forms/inputs.php | 101 +++++++++++++++++++++ views/default/input/email.php | 12 --- views/default/input/url.php | 13 --- 4 files changed, 102 insertions(+), 25 deletions(-) create mode 100644 views/default/html5/theme_preview/forms/inputs.php delete mode 100644 views/default/input/email.php delete mode 100644 views/default/input/url.php diff --git a/start.php b/start.php index 3df8fe0bd..462eb88e7 100644 --- a/start.php +++ b/start.php @@ -2,6 +2,7 @@ function html5_init() { elgg_extend_view('css/elgg', 'html5/css', 1); + elgg_extend_view('theme_preview/forms/inputs', 'html5/theme_preview/forms/inputs'); elgg_register_js('Modernizr', '/mod/html5/vendors/Modernizr-1.5.js', 'head', 1); elgg_register_js('jquery.placeholder', '/mod/html5/vendors/jquery/jquery.placeholder-1.0.1.js', 'footer'); diff --git a/views/default/html5/theme_preview/forms/inputs.php b/views/default/html5/theme_preview/forms/inputs.php new file mode 100644 index 000000000..de38dc71c --- /dev/null +++ b/views/default/html5/theme_preview/forms/inputs.php @@ -0,0 +1,101 @@ +

+ HTML5 Inputs +

+ Color input (.elgg-input-color): + 'color', + 'id' => 'color', + )); + ?> +

+ Local datetime input (.elgg-input-datetime-local): + 'datetime-local', + 'id' => 'datetime-local', + )); + ?> +

+ Datetime input (.elgg-input-datetime):
+ 'datetime', + 'id' => 'datetime', + )); + ?> +

+ Email input (.elgg-input-email):
+ 'email', + 'id' => 'email', + )); + ?> +

+ Image input (.elgg-input-image):
+ 'image', + 'id' => 'image', + )); + ?> +

+ Month input (.elgg-input-month):
+ 'month', + 'id' => 'month', + )); + ?> +

+ Number input (.elgg-input-number): + 'number', + 'id' => 'number', + )); + ?> +

+ Range input (.elgg-input-range): + 'range', + 'id' => 'range', + )); + ?> +

+ Tags input (.elgg-input-search): + 'search', + 'id' => 'search', + )); + ?> +

+ Telephone input (.elgg-input-tel): + 'tel', + 'id' => 'tel', + )); + ?> +

+ Time input (.elgg-input-time): + 'time', + 'id' => 'time', + )); + ?> +

+ Week input (.elgg-input-week): + 'week', + 'id' => 'week', + )); + ?> +

\ No newline at end of file diff --git a/views/default/input/email.php b/views/default/input/email.php deleted file mode 100644 index de98d9c4f..000000000 --- a/views/default/input/email.php +++ /dev/null @@ -1,12 +0,0 @@ - 'elgg-input-email', -); - -$vars = array_merge($defaults, $vars); - -$vars['type'] = 'email'; - -?> - - /> \ No newline at end of file diff --git a/views/default/input/url.php b/views/default/input/url.php deleted file mode 100644 index ed3cd08a2..000000000 --- a/views/default/input/url.php +++ /dev/null @@ -1,13 +0,0 @@ - 'elgg-input-url', -); - -$vars = array_merge($defaults, $vars); - -$vars['type'] = 'url'; - -?> - - /> \ No newline at end of file -- cgit v1.2.3 From 0c70885f0a18474656a382f54f85706efaf17752 Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Thu, 19 May 2011 16:19:57 -0700 Subject: Deleted extraneous language file --- languages/en.php | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 languages/en.php diff --git a/languages/en.php b/languages/en.php deleted file mode 100644 index e810da873..000000000 --- a/languages/en.php +++ /dev/null @@ -1,19 +0,0 @@ - '', - 'placeholder:color' => '', - 'placeholder:datetime-local' => '', - 'placeholder:datetime' => '', - 'placeholder:email' => '', - 'placeholder:month' => '', - 'placeholder:number' => '', - 'placeholder:password' => '', - 'placeholder:search' => '', - 'placeholder:tags' => '', - 'placeholder:tel' => '', - 'placeholder:time' => '', - 'placeholder:url' => '', - 'placeholder:week' => '', -); - -add_translation('en', $english); \ No newline at end of file -- cgit v1.2.3 From 38342cd98c03c9aacd985f97557148eeed628c42 Mon Sep 17 00:00:00 2001 From: Evan Winslow Date: Fri, 20 May 2011 15:00:44 -0700 Subject: removed output/url view: not providing any special html5 features --- views/default/output/url.php | 47 -------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 views/default/output/url.php diff --git a/views/default/output/url.php b/views/default/output/url.php deleted file mode 100644 index 31db9e928..000000000 --- a/views/default/output/url.php +++ /dev/null @@ -1,47 +0,0 @@ - tags - * @uses string $vars['text'] The string between the tags. - * @uses bool $vars['is_action'] Is this a link to an action? - * - */ - -if (isset($vars['value'])) { - $vars['href'] = $vars['value']; - unset($vars['value']); -} - -$url = trim($vars['href']); - -if (isset($vars['is_action']) && $vars['is_action']) { - $url = elgg_add_action_tokens_to_url($url); - unset($vars['is_action']); -} - -if (isset($vars['body'])) { - $body = $vars['body']; - unset($vars['body']); -} - -if (!isset($body)) { - if (isset($vars['text'])) { - $text = $vars['text']; - unset($vars['text']); - } else { - $text = $url; - } - - $body = htmlentities($text, ENT_QUOTES, 'UTF-8'); -} - -$vars['href'] = $url; -$attributes = elgg_format_attributes($vars); -echo "$body"; -- cgit v1.2.3 From eedfbb15b8d1e81e2e11b34f02b68df6700b288d Mon Sep 17 00:00:00 2001 From: Sem Date: Tue, 31 Jul 2012 22:09:18 +0200 Subject: Added doctype, header, footer and aside tags. Fixed time tag. --- views/default/output/friendlytime.php | 3 +- views/default/page/admin.php | 66 ++++++++++++++++++++++++ views/default/page/default.php | 74 +++++++++++++++++++++++++++ views/default/page/elements/doctype.php | 1 - views/default/page/elements/foot.php | 11 ++++ views/default/page/elements/footer.php | 22 ++++++++ views/default/page/elements/head.php | 79 +++++++++++++++++++++++++++++ views/default/page/elements/owner_block.php | 31 +++++++++++ views/default/page/layouts/admin.php | 40 +++++++++++++++ views/default/page/layouts/one_sidebar.php | 48 ++++++++++++++++++ views/default/page/layouts/two_sidebar.php | 43 ++++++++++++++++ views/default/page/walled_garden.php | 27 ++++++++++ 12 files changed, 443 insertions(+), 2 deletions(-) create mode 100644 views/default/page/admin.php create mode 100644 views/default/page/default.php delete mode 100644 views/default/page/elements/doctype.php create mode 100644 views/default/page/elements/foot.php create mode 100644 views/default/page/elements/footer.php create mode 100644 views/default/page/elements/head.php create mode 100644 views/default/page/elements/owner_block.php create mode 100644 views/default/page/layouts/admin.php create mode 100644 views/default/page/layouts/one_sidebar.php create mode 100644 views/default/page/layouts/two_sidebar.php create mode 100644 views/default/page/walled_garden.php diff --git a/views/default/output/friendlytime.php b/views/default/output/friendlytime.php index 3618e7f56..c9c74e880 100644 --- a/views/default/output/friendlytime.php +++ b/views/default/output/friendlytime.php @@ -8,5 +8,6 @@ $friendly_time = elgg_get_friendly_time($vars['time']); $timestamp = htmlentities(date(elgg_echo('friendlytime:date_format'), $vars['time'])); +$datetime = htmlentities(date("Y-m-d h:m", $vars['time'])); -echo "$friendly_time"; +echo "$friendly_time"; diff --git a/views/default/page/admin.php b/views/default/page/admin.php new file mode 100644 index 000000000..7d0449096 --- /dev/null +++ b/views/default/page/admin.php @@ -0,0 +1,66 @@ +$notices_html"; +} + +// render content before head so that JavaScript and CSS can be loaded. See #4032 +$messages = elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); +$header = elgg_view('admin/header', $vars); +$body = $vars['body']; +$footer = elgg_view('admin/footer', $vars); + + +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + +?> + + + + + + +

+ +

+ + +

+ +

+ + + + \ No newline at end of file diff --git a/views/default/page/default.php b/views/default/page/default.php new file mode 100644 index 000000000..f75fa1908 --- /dev/null +++ b/views/default/page/default.php @@ -0,0 +1,74 @@ + $vars['sysmessages'])); +$header = elgg_view('page/elements/header', $vars); +$body = elgg_view('page/elements/body', $vars); +$footer = elgg_view('page/elements/footer', $vars); + +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + +?> + + + + + + +

+ +

+ + + + + + +

+ +

+ + + \ No newline at end of file diff --git a/views/default/page/elements/doctype.php b/views/default/page/elements/doctype.php deleted file mode 100644 index 763b0739b..000000000 --- a/views/default/page/elements/doctype.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php new file mode 100644 index 000000000..a56b373b4 --- /dev/null +++ b/views/default/page/elements/foot.php @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php new file mode 100644 index 000000000..ded2cea9a --- /dev/null +++ b/views/default/page/elements/footer.php @@ -0,0 +1,22 @@ + 'priority', 'class' => 'elgg-menu-hz')); + +$powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif"; + +echo '

'; +echo elgg_view('output/url', array( + 'href' => 'http://elgg.org', + 'text' => " $\"Powered$ ", + 'class' => '', + 'is_trusted' => true, +)); +echo '

'; diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php new file mode 100644 index 000000000..b1556b547 --- /dev/null +++ b/views/default/page/elements/head.php @@ -0,0 +1,79 @@ + + +END; +} else { + $feedref = ""; +} + +$js = elgg_get_loaded_js('head'); +$css = elgg_get_loaded_css(); + +$version = get_version(); +$release = get_version(true); +?> + + + + <?php echo $title; ?> + + + + + + + + + + + + + + + + + +getGUID() != elgg_get_logged_in_user_guid())) { + + $header = elgg_view_entity($owner, array('full_view' => false)); + + $body = elgg_view_menu('owner_block', array('entity' => $owner)); + + $body .= elgg_view('page/elements/owner_block/extend', $vars); + + echo elgg_view('page/components/module', array( + 'header' => $header, + 'body' => $body, + 'class' => 'elgg-owner-block', + )); +} + +elgg_pop_context(); \ No newline at end of file diff --git a/views/default/page/layouts/admin.php b/views/default/page/layouts/admin.php new file mode 100644 index 000000000..f9975d3e4 --- /dev/null +++ b/views/default/page/layouts/admin.php @@ -0,0 +1,40 @@ + + + \ No newline at end of file diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php new file mode 100644 index 000000000..61d6fed0e --- /dev/null +++ b/views/default/page/layouts/one_sidebar.php @@ -0,0 +1,48 @@ + + +

+ + +

+ +

diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php new file mode 100644 index 000000000..b2660a155 --- /dev/null +++ b/views/default/page/layouts/two_sidebar.php @@ -0,0 +1,43 @@ + + +

+ + + +

+ +

diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php new file mode 100644 index 000000000..e1d57dac8 --- /dev/null +++ b/views/default/page/walled_garden.php @@ -0,0 +1,27 @@ + + + + + + + +

+ $vars['sysmessages'])); ?> +

+ +

+ + + \ No newline at end of file -- cgit v1.2.3 From c6bf8d8ab9463722da4e1e0323c3383e08b8924e Mon Sep 17 00:00:00 2001 From: Sem Date: Thu, 14 Feb 2013 14:02:41 +0100 Subject: Using correct language in html tag and putting a placeholder in the search box. --- views/default/page/admin.php | 4 ++-- views/default/page/default.php | 4 ++-- views/default/page/elements/head.php | 8 +++---- views/default/page/walled_garden.php | 4 ++-- views/default/search/search_box.php | 41 ++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 views/default/search/search_box.php diff --git a/views/default/page/admin.php b/views/default/page/admin.php index 7d0449096..a6d6bf6e1 100644 --- a/views/default/page/admin.php +++ b/views/default/page/admin.php @@ -32,7 +32,7 @@ header("Content-type: text/html; charset=UTF-8"); ?> - + @@ -63,4 +63,4 @@ header("Content-type: text/html; charset=UTF-8"); - \ No newline at end of file + diff --git a/views/default/page/default.php b/views/default/page/default.php index f75fa1908..a0e6d4037 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -35,7 +35,7 @@ header("Content-type: text/html; charset=UTF-8"); ?> - + @@ -71,4 +71,4 @@ header("Content-type: text/html; charset=UTF-8"); - \ No newline at end of file + diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php index b1556b547..e7951c4ff 100644 --- 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); ?> - - + <?php echo $title; ?> @@ -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 e1d57dac8..77c901d8c 100644 --- 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"); ?> - + @@ -24,4 +24,4 @@ header("Content-type: text/html; charset=UTF-8"); - \ No newline at end of file + diff --git a/views/default/search/search_box.php b/views/default/search/search_box.php new file mode 100644 index 000000000..c1ea40705 --- /dev/null +++ b/views/default/search/search_box.php @@ -0,0 +1,41 @@ +,&, 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); + +?> + + -- cgit v1.2.3 From b56c888650b1bfc127f9a8314a33a136eb752e66 Mon Sep 17 00:00:00 2001 From: hellekin Date: Mon, 18 Feb 2013 21:28:02 -0300 Subject: Fix 'headers already sent' --- views/default/page/default.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/views/default/page/default.php b/views/default/page/default.php index a0e6d4037..40ad2c69f 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -30,13 +30,11 @@ $header = elgg_view('page/elements/header', $vars); $body = elgg_view('page/elements/body', $vars); $footer = elgg_view('page/elements/footer', $vars); -// Set the content type -header("Content-type: text/html; charset=UTF-8"); - ?> + @@ -44,7 +42,7 @@ header("Content-type: text/html; charset=UTF-8");

- + - +

-- cgit v1.2.3 From 9cffddf0969ee63002c2a6c3574bdc796849e9ee Mon Sep 17 00:00:00 2001 From: Sem Date: Thu, 21 Feb 2013 00:52:32 +0100 Subject: Using ISO 8601 in time datetime attribute. --- manifest.xml | 8 ++++---- views/default/output/friendlytime.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.xml b/manifest.xml index 3f874d3bf..8b01d421e 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,15 +1,15 @@ HTML5 - Evan Winslow - 1.0 + Evan Winslow and Lorea Developers + 1.1 Provides several javascript libraries + views that allow developers to start using HTML5 features in Elgg today. (C) Evan Winslow 2010 http://github.com/ewinslow/elgg-html5 - elgg_version - 2011031400 + elgg_release + 1.8 \ No newline at end of file diff --git a/views/default/output/friendlytime.php b/views/default/output/friendlytime.php index c9c74e880..b752b74ce 100644 --- a/views/default/output/friendlytime.php +++ b/views/default/output/friendlytime.php @@ -8,6 +8,6 @@ $friendly_time = elgg_get_friendly_time($vars['time']); $timestamp = htmlentities(date(elgg_echo('friendlytime:date_format'), $vars['time'])); -$datetime = htmlentities(date("Y-m-d h:m", $vars['time'])); +$datetime = htmlentities(date("c", $vars['time'])); echo "$friendly_time"; -- cgit v1.2.3 From 8819bab8c0735c0ec428672fd36381c25823440b Mon Sep 17 00:00:00 2001 From: Sem Date: Thu, 21 Feb 2013 00:56:42 +0100 Subject: Erasing meta tag because is already writed by page/default view. --- views/default/page/default.php | 1 - 1 file changed, 1 deletion(-) diff --git a/views/default/page/default.php b/views/default/page/default.php index 40ad2c69f..491f691f4 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -34,7 +34,6 @@ $footer = elgg_view('page/elements/footer', $vars); - -- cgit v1.2.3 From 88733a24caee170acda071281eb4630bf5ef5794 Mon Sep 17 00:00:00 2001 From: Sem Date: Thu, 22 Aug 2013 17:34:22 -0400 Subject: Added @override keyword at some actions and views --- views/default/output/friendlytime.php | 1 + views/default/page/admin.php | 2 ++ views/default/page/default.php | 2 ++ views/default/page/elements/foot.php | 3 +++ views/default/page/elements/footer.php | 1 + views/default/page/elements/head.php | 1 + views/default/page/elements/owner_block.php | 1 + views/default/page/layouts/admin.php | 2 ++ views/default/page/layouts/one_sidebar.php | 2 ++ views/default/page/layouts/two_sidebar.php | 2 ++ views/default/page/walled_garden.php | 2 ++ views/default/search/search_box.php | 2 ++ 12 files changed, 21 insertions(+) diff --git a/views/default/output/friendlytime.php b/views/default/output/friendlytime.php index b752b74ce..dc9699fba 100644 --- a/views/default/output/friendlytime.php +++ b/views/default/output/friendlytime.php @@ -4,6 +4,7 @@ * Translates an epoch time into a human-readable time. * * @uses string $vars['time'] Unix-style epoch timestamp + * @override views/default/output/friendlytime.php */ $friendly_time = elgg_get_friendly_time($vars['time']); diff --git a/views/default/page/admin.php b/views/default/page/admin.php index a6d6bf6e1..e1180e851 100644 --- a/views/default/page/admin.php +++ b/views/default/page/admin.php @@ -8,6 +8,8 @@ * @uses $vars['title'] The page title * @uses $vars['body'] The main content of the page * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages() + * + * @override views/default/page/admin.php */ $notices_html = ''; diff --git a/views/default/page/default.php b/views/default/page/default.php index 491f691f4..7a74a0459 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -9,6 +9,8 @@ * @uses $vars['title'] The page title * @uses $vars['body'] The main content of the page * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages() + * + * @override views/default/page/default.php */ // backward compatability support for plugins that are not using the new approach diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php index a56b373b4..6736fe3ab 100644 --- a/views/default/page/elements/foot.php +++ b/views/default/page/elements/foot.php @@ -1,4 +1,7 @@ diff --git a/views/default/page/layouts/one_sidebar.php b/views/default/page/layouts/one_sidebar.php index 61d6fed0e..e5e063b51 100644 --- a/views/default/page/layouts/one_sidebar.php +++ b/views/default/page/layouts/one_sidebar.php @@ -10,6 +10,8 @@ * @uses $vars['title'] Optional title for main content area * @uses $vars['class'] Additional class to apply to layout * @uses $vars['nav'] HTML of the page nav (override) (default: breadcrumbs) + * + * @override views/default/page/layouts/one_sidebar.php */ $class = 'elgg-layout elgg-layout-one-sidebar clearfix'; diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php index b2660a155..929547424 100644 --- a/views/default/page/layouts/two_sidebar.php +++ b/views/default/page/layouts/two_sidebar.php @@ -9,6 +9,8 @@ * @uses $vars['sidebar'] Optional content that is displayed in the sidebar * @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar * @uses $vars['class'] Additional class to apply to layout + * + * @override views/default/page/layouts/two_sidebar.php */ $class = 'elgg-layout elgg-layout-two-sidebar clearfix'; diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php index 77c901d8c..1075ea811 100644 --- a/views/default/page/walled_garden.php +++ b/views/default/page/walled_garden.php @@ -3,6 +3,8 @@ * Walled garden page shell * * Used for the walled garden index page + * + * @override views/default/page/walled_garden.php */ // Set the content type diff --git a/views/default/search/search_box.php b/views/default/search/search_box.php index c1ea40705..9d0ed5e91 100644 --- a/views/default/search/search_box.php +++ b/views/default/search/search_box.php @@ -4,6 +4,8 @@ * * @uses $vars['value'] Current search query * @uses $vars['class'] Additional class + * + * @override mod/search/views/default/search/search_box.php */ if (array_key_exists('value', $vars)) { -- cgit v1.2.3 From 46c365abd6e190a5c389b0dd49b02cd6e878ccd9 Mon Sep 17 00:00:00 2001 From: Sem Date: Fri, 23 Aug 2013 04:57:44 +0200 Subject: Updated to Elgg 1.8.16. --- views/default/page/default.php | 13 ++++++++---- views/default/page/elements/foot.php | 11 ---------- views/default/page/elements/footer.php | 4 ++-- views/default/page/elements/owner_block.php | 31 ----------------------------- views/default/page/walled_garden.php | 15 +++++++++++++- views/default/search/search_box.php | 2 +- 6 files changed, 26 insertions(+), 50 deletions(-) delete mode 100644 views/default/page/elements/foot.php delete mode 100644 views/default/page/elements/owner_block.php diff --git a/views/default/page/default.php b/views/default/page/default.php index 491f691f4..aba69aebc 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -30,9 +30,14 @@ $header = elgg_view('page/elements/header', $vars); $body = elgg_view('page/elements/body', $vars); $footer = elgg_view('page/elements/footer', $vars); +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + +$lang = get_current_language(); + ?> - + @@ -41,14 +46,14 @@ $footer = elgg_view('page/elements/footer', $vars);

- - + + - +

diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php deleted file mode 100644 index a56b373b4..000000000 --- a/views/default/page/elements/foot.php +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php index ded2cea9a..318a98b2d 100644 --- a/views/default/page/elements/footer.php +++ b/views/default/page/elements/footer.php @@ -12,11 +12,11 @@ echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-me $powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif"; -echo '

'; +echo '

'; +echo ''; diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php deleted file mode 100644 index fc7f0f6d2..000000000 --- a/views/default/page/elements/owner_block.php +++ /dev/null @@ -1,31 +0,0 @@ -getGUID() != elgg_get_logged_in_user_guid())) { - - $header = elgg_view_entity($owner, array('full_view' => false)); - - $body = elgg_view_menu('owner_block', array('entity' => $owner)); - - $body .= elgg_view('page/elements/owner_block/extend', $vars); - - echo elgg_view('page/components/module', array( - 'header' => $header, - 'body' => $body, - 'class' => 'elgg-owner-block', - )); -} - -elgg_pop_context(); \ No newline at end of file diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php index 77c901d8c..26d1235c2 100644 --- a/views/default/page/walled_garden.php +++ b/views/default/page/walled_garden.php @@ -5,6 +5,12 @@ * Used for the walled garden index page */ +$is_sticky_register = elgg_is_sticky_form('register'); +$wg_body_class = 'elgg-body-walledgarden'; +if ($is_sticky_register) { + $wg_body_class .= ' hidden'; +} + // Set the content type header("Content-type: text/html; charset=UTF-8"); ?> @@ -18,10 +24,17 @@ header("Content-type: text/html; charset=UTF-8");

$vars['sysmessages'])); ?>

+ + + diff --git a/views/default/search/search_box.php b/views/default/search/search_box.php index c1ea40705..4223661b3 100644 --- a/views/default/search/search_box.php +++ b/views/default/search/search_box.php @@ -34,7 +34,7 @@ $display_query = htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);