Commits

Scott Nixon committed e85a57c

Update design. no real progressfrom hacking on css with compass.

  • Participants
  • Parent commits 5d73e5f

Comments (0)

Files changed (5)

File run/templates/admin/article/change_form.html

+{% extends "admin/base_site.html" %}
+{% load i18n admin_modify adminmedia %}
+
+{% block extrahead %}{{ block.super }}
+{% url admin:jsi18n as jsi18nurl %}
+
+{{ media }}
+
+<!-- Skin CSS file -->
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.1/build/assets/skins/sam/skin.css">
+<!-- Utility Dependencies -->
+<script src="http://yui.yahooapis.com/2.8.1/build/yahoo-dom-event/yahoo-dom-event.js"></script> 
+<script src="http://yui.yahooapis.com/2.8.1/build/element/element-min.js"></script> 
+<!-- Needed for Menus, Buttons and Overlays used in the Toolbar -->
+<script src="http://yui.yahooapis.com/2.8.1/build/container/container_core-min.js"></script>
+<script src="http://yui.yahooapis.com/2.8.1/build/menu/menu-min.js"></script>
+<script src="http://yui.yahooapis.com/2.8.1/build/button/button-min.js"></script>
+<!-- Source file for Rich Text Editor-->
+<script src="http://yui.yahooapis.com/2.8.1/build/editor/editor-min.js"></script>
+
+<script type="text/javascript">
+
+var myEditor = new YAHOO.widget.Editor('id_post_content', {
+    dompath: true, //Turns on the bar at the bottom
+    animate: true //Animates the opening, closing and moving of Editor windows
+});
+myEditor.render();
+
+var myEditor2 = new YAHOO.widget.Editor('id_recipe_description', {
+    dompath: true, //Turns on the bar at the bottom
+    animate: true //Animates the opening, closing and moving of Editor windows
+});
+myEditor2.render();
+
+var myEditor3 = new YAHOO.widget.Editor('id_recipe_instructions', {
+    dompath: true, //Turns on the bar at the bottom
+    animate: true //Animates the opening, closing and moving of Editor windows
+});
+myEditor3.render();
+
+</script>
+	
+{% endblock %}
+
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
+
+{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
+
+{% block bodyclass %}{{ block.super }}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form yui-skin-sam{% endblock %}
+
+
+{% block breadcrumbs %}{% if not is_popup %}
+<div class="breadcrumbs">
+     <a href="../../../">{% trans "Home" %}</a> &rsaquo;
+     <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo; 
+     {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo; 
+     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
+</div>
+{% endif %}{% endblock %}
+
+{% block content %}<div id="content-main">
+{% block object-tools %}
+{% if change %}{% if not is_popup %}
+  <ul class="object-tools"><li><a href="history/" class="historylink">{% trans "History" %}</a></li>
+  {% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
+  </ul>
+{% endif %}{% endif %}
+{% endblock %}
+<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
+<div>
+{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
+{% if save_on_top %}{% submit_row %}{% endif %}
+{% if errors %}
+    <p class="errornote">
+    {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
+    </p>
+    {{ adminform.form.non_field_errors }}
+{% endif %}
+
+{% for fieldset in adminform %}
+  {% include "admin/includes/fieldset.html" %}
+{% endfor %}
+
+{% block after_field_sets %}{% endblock %}
+
+{% for inline_admin_formset in inline_admin_formsets %}
+    {% include inline_admin_formset.opts.template %}
+{% endfor %}
+
+{% block after_related_objects %}{% endblock %}
+
+{% submit_row %}
+
+{% if adminform and add %}
+   <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script>
+{% endif %}
+
+{# JavaScript for prepopulated fields #}
+{% prepopulated_fields_js %}
+
+</div>
+</form></div>
+{% endblock %}

File run/templates/article/faq_index.html

 	</div>
 {% for post in posts %}
 	<div class="faq-item">
-        <h2 id='{{ post.post_slug }}' class="faq_name">{{ post.post_title }}</a></h2>
+        <h1 id='{{ post.post_slug }}' class="faq_name">{{ post.post_title }}</a></h1>
 		<p>{{ post.post_content|safe }}</p>
 	</div>	
 {% empty %}

File run/templates/article/post_index.html

 	<div class='article-block'>
 		<article class="post-item">
 			<header class="headline_area">
-			<h1 class="post-title"><a alt="permanent link to {{ post.post_title }}" 
+			<h1 class="post-title"><a rel="permanent link to {{ post.post_title }}" 
 			href="{{ post.get_absolute_url }}">
 			{{ post.post_title }}</a></h1>			
-			<time datetime='{{ post.post_date_create }}' pubdate>Written by {{post.post_author.first_name}} {{ post.post_author.last_name }} on {{ post.post_date_create|date:"F j, Y" }}</time>
+			<time datetime='{{ post.post_date_create|date:"SHORT_DATE_FORMAT" }}' pubdate>Written by {{post.post_author.first_name}} {{ post.post_author.last_name }} on {{ post.post_date_create|date:"F j, Y" }}</time>
 				
 			</header>
 			<p>{{ post.post_content|safe|linebreaks }}</p>	
 			</article><!-- End Recipe -->
 			{% endif %}
 			<article>
-			  <p class="comments_count float-left"><span class="bracket">{</span> <a alt="permanent link to {{ post.post_title }}" 
+			  <p class="comments_count float-left"><span class="bracket">{</span> <a rel="permanent link to {{ post.post_title }}" 
 			  href="{{ post.get_absolute_url }}#disqus_thread">{% disqus_num_replies %}</a><span class="bracket"> }</span></p>
 			  
 			  <span class='float-right'>

File run/templates/article/recipe_detail.html

 		<!-- Begin Recipe -->
 		<article class="recipe">
 		  <header>
-		    <h1 class="recipe_name">{{ recipe.recipe_name }}</h1>
+		    <h1 class="recipe_name" style='font-size:1.5em;'>{{ recipe.recipe_name }}</h1>
 		    {% if photocount %}
 		      <div id="flashContent" style="height:317px;">
 			    <p>Please <a href="http://get.adobe.com/flashplayer/">install Flash&reg;</a> and turn on Javascript.</p>		
 		    <span>
 		    <form action="/lists/add/{{ recipe.id}}/" method="post">
 		    <input type="submit" value="Add to Shopping List" /></form></span> -->
-		    <h2>Servings: {{ recipe.recipe_servings|floatformat:"-2" }}</h2>
+		    <h2 style="font-size:'0.8em;color:#888;'">Servings: {{ recipe.recipe_servings|floatformat:"-2" }}</h2>
 		  </header>
 		    <h2>Description:</h2>
 		    <div class="description">{{ recipe.recipe_description|safe }}</div>

File run/templates/index.html

 	      <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 	      <![endif]-->
 	      <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-	      	      	
-	      <link rel="stylesheet" type="text/css" href="http://css.happyherbivore.com/herbisport/main-style.css" />
+	      	      	<!-- http://css.happyherbivore.com/herbisport/main-style.css -->
+	      <link rel="stylesheet" type="text/css" href="/media/css/herbisport/main-style.css" />
 
 	      
 		{% block extrahead %}