Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

w3c validation for archive

  • Loading branch information...
commit ca6a33ea68657e2c1ba7cb49a3a32a13786c34e4 2 parents bb59856 + 3d25d7f
@marcoraddatz authored
View
4 Archive/views/show.tpl
@@ -3,7 +3,9 @@
<ul>
{foreach from=$data item=d key=month}
<li>
- <a href='#{$month}' name='archive-{$month}' class='js-archive_month'>{$month} ({$d|@count})</a>
+ <a href="#archive-{$month|replace:' ':''}"
+ id="archive-{$month|replace:' ':''}"
+ class='js-archive_month'>{$month} ({$d|@count})</a>
<ul style='display:none'>
{foreach $d as $entry}
<li>
View
9 Markdown/Markdown.controller.php
@@ -96,9 +96,16 @@ public function __construct(&$aRequest, &$aSession, &$oPlugins) {
* @return array
*
*/
+<<<<<<< HEAD
public static final function getInfo() {
return array( 'url' => 'http://daringfireball.net/projects/markdown/syntax',
'description' => 'Markdown',
'iconurl' => '/vendor/candyCMS/plugins/Markdown/assets/icon39x24.png');
+=======
+ public final function getInfo() {
+ return array('url' => 'http://daringfireball.net/projects/markdown/syntax',
+ 'description' => 'Markdown',
+ 'iconurl' => '/vendor/candyCMS/plugins/Markdown/assets/icon.png');
+>>>>>>> 3d25d7fd09f84688b6c50f15fa4ae8dcf6f09aba
}
-}
+}
View
BIN  Markdown/assets/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Markdown/assets/icon39x24.png
Deleted file not rendered
View
17 composer.json
@@ -7,19 +7,22 @@
"license": "MIT",
"require": {
- "php": ">=5.3.0"
+ "php": ">=5.3.0",
+
+ "candycms/core": ">=2.1.0",
+
+ "facebook/php-sdk": "3.2.*",
+ "dflydev/markdown" : "1.0.*",
+ "cnlpete/image-metadata-parser" : "0.0.*"
},
- "authors": [
- {
+ "authors": [ {
"name": "Marco Raddatz",
"homepage": "http://www.marcoraddatz.com"
- },
- {
+ }, {
"name": "Hauke Schade",
"homepage": "http://www.hauke-schade.de/"
- }
- ],
+ }],
"autoload": {
"psr-0": {
Please sign in to comment.
Something went wrong with that request. Please try again.