Commits

Anonymous committed 015f945

Article format choice in article_display now functional

Comments (0)

Files changed (3)

static/css/_main.css

 		color: #777;
 		}
 code {
-	background: #ddd;
 	}
 	
 p code {
 					}
 			#navbar h2 span {
 				font-size: 12px;
-				color: #6BBA70;
+				color: #ccc;
 				vertical-align: top;
 				font-family: sans-serif;
 				}
 	display: none;
 	}
 	
-.article h4.article_link, h1.comments {
+.article h4.article_link, .article h4.available_formats, h1.comments {
 	display: none;
 	}
 h1 span a {

static/css/article_display.css

 .article_display .article h4 {
 text-align: center;
 	}
-.article_display .article h4.article_link, .article_display h1.comments {
+.article_display .article h4.article_link, .article_display h1.comments, .article_display h4.available_formats {
 	display: block;
 	}
 .article h4.article_link a {

templates/article.html

 $def with (article)
 		<div class="original_article"></div>
 		<div class="article" id="article_$article['id_']">
-			<h1><a href="$article['base_url']$article['year']/$article['month']/$article['day']/$article['url_id']/">$article['title']</a> <span class="info_elements"><span><a href="$article['base_url']$article['year']/$article['month']/$article['day']/$article['url_id']/#comments" class="comment_count">$article['comment_count'] comments</a>
+			<h1><a href="$article['base_url']$article['year']/$article['month']/$article['day']/$(article['url_id']).html">$article['title']</a> <span class="info_elements"><span><a href="$article['base_url']$article['year']/$article['month']/$article['day']/$(article['url_id']).html#comments" class="comment_count">$article['comment_count'] comments</a>
 			$if article['session'].auth == 1:
 				<span><a href="#" class="admin_link admin_edit" id="edit_$article['id_']">&Delta;</a></span>&#160;<span><a href="#" class="admin_link admin_delete_article" id="delete_$article['id_']">&otimes;</a></span></span></span>
 			$else:
 			<!-- Content -->
 			$article['content']
 			<!-- /Content -->
-			<h4 class="article_link">Link: <a href="$article['base_url']$article['year']/$article['month']/$article['day']/$article['url_id']/">$article['base_url']$article['year']/$article['month']/$article['day']/$article['url_id']</a></h4>
+			<h4 class="article_link">Link: <a href="$article['base_url']$article['year']/$article['month']/$article['day']/$(article['url_id']).html">$article['base_url']$article['year']/$article['month']/$article['day']/$article['url_id']</a></h4>
+			<h4 class="available_formats">Available formats: <a href="$article['base_url']$article['year']/$article['month']/$article['day']/$(article['url_id']).html">HTML</a> <a href="$article['base_url']$article['year']/$article['month']/$article['day']/$(article['url_id']).markdown">Markdown</a>
 		</div>
 		<h1 id="comments" class="comments">Comments</h1>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.