Merge branch 'master' of https://github.com/daeken/QuestCompanions

daeken · Apr 29, 2012 · efcf28b · efcf28b
2 parents 7180481 + d8f7471
commit efcf28b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/static/css/core.css b/static/css/core.css
@@ -201,6 +201,11 @@ margin: 0;
 padding: 0;
 }
 
+ul.flat li {
+list-style: none;
+margin: 10px 0;
+}
+
 small {
 font-size: .8em; 
 color: #999;

diff --git a/templates/admin/news.html b/templates/admin/news.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
 {% block title %}News Admin{% endblock %}
 {% block includes %}
+<link rel="stylesheet" type="text/css" href="/static/css/buttons.css" />
 {% endblock %}
 {% block content %}
 <h1>News</h1>
-<a href="{{ handler.admin.get_news_create }}">Create</a>
+<a href="{{ handler.admin.get_news_create }}" class="silver button">Create</a>
 <ul>
   {% for story in news %}
 	  <li><a href="{{ handler.admin.get_news.url(story.id) }}">{{ story.headline }}</a></li>

diff --git a/templates/admin/news_create.html b/templates/admin/news_create.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% block title %}New News{% endblock %}
 {% block includes %}
+<link rel="stylesheet" type="text/css" href="/static/css/forms.css" />
+<link rel="stylesheet" type="text/css" href="/static/css/buttons.css" />
 <style>
   label{ float:left;}
   input, textarea{ margin-bottom: 10px; padding: 5px}
@@ -10,6 +12,6 @@
 <form action="{{ handler.admin.post_news_create }}" method="POST">$CSRF$
 	<label> Headline:</label> <input type="text" name="headline"><br>
 	<label>Content:</label> <textarea name="story" cols="80" rows="20"></textarea><br>
-	<input type="submit" value="Save">
+	<button type="submit" value="Save">Save</button>
 </form>
 {% endblock %}
diff --git a/templates/invite/index.html b/templates/invite/index.html
@@ -23,7 +23,6 @@ <h3>Invite a friend</h3>
 </script>
 <br>
 <form action="{{ handler.invite.post_index }}" method="POST">$CSRF$
-  <label class="small">Email:</label><input type="text" name="email"><br>
-  <button type="submit">Invite</button>
+  <label class="small">Email an invite:</label><input type="text" name="email"> <button type="submit">Invite</button>
 </form>
 {% endblock %}