@@ -72,6 +72,8 @@ class BaseController(webapp2.RequestHandler):
self.blog.save()
else:
self.blog = self.blog[0]
+ cfg.CFG['demisauce.apikey'] = self.blog.dsapikey
+ cfg.CFG['demisauce.appname'] = self.blog.dsappname
current_userisadmin = False
if users.get_current_user() and users.is_current_user_admin():
current_userisadmin = True
@@ -215,6 +217,8 @@ class AdminConfig(BaseController):
blog.area3 = self.request.get('area3')
blog.analyticsjs = self.request.get('analyticsjs')
blog.commentjs = self.request.get('commentjs')
+ blog.dsapikey = self.request.get('dsapikey')
+ blog.dsappname = self.request.get('dsappname')
blog.save()
self.redirect('/admin/entry/list/post')
blog.py
@@ -10,7 +10,7 @@ indexes:
# automatically uploaded to the admin console when you next deploy
# your application using appcfg.py.
-# Used 4 times in query history.
+# Used 5 times in query history.
- kind: Archive
properties:
- name: date
@@ -22,14 +22,14 @@ indexes:
- name: date
direction: desc
-# Used 13 times in query history.
+# Used 28 times in query history.
- kind: Entry
properties:
- name: entrytype
- name: date
direction: desc
-# Used 6 times in query history.
+# Used 3 times in query history.
- kind: Entry
properties:
- name: entrytype
@@ -38,7 +38,7 @@ indexes:
- name: date
direction: desc
-# Used 57 times in query history.
+# Used 112 times in query history.
- kind: Entry
properties:
- name: entrytype
@@ -46,7 +46,7 @@ indexes:
- name: date
direction: desc
-# Used 24 times in query history.
+# Used 88 times in query history.
- kind: Entry
properties:
- name: entrytype
index.yaml
@@ -9,12 +9,6 @@ from demisaucepy.declarative import has_a, has_many, \
from demisaucepy import cfg
-
-
-cfg.CFG['demisauce.apikey'] = 'a95c21ee8e64cb5ff585b5f9b761b39d7cb9a202'
-cfg.CFG['demisauce.url'] = 'http://localhost:4951'
-cfg.CFG['demisauce.appname'] = 'djangodemo'
-
class BaseModel(db.Model):
def __init__(self, parent=None, key_name=None, _app=None, **kwds):
self.__isdirty = False
@@ -65,6 +59,8 @@ class Blog(db.Model):
tags = db.TextProperty(default='{}')
analyticsjs = db.TextProperty(default='')
commentjs = db.TextProperty(default='')
+ dsapikey = db.StringProperty(multiline=False)
+ dsappname = db.StringProperty(multiline=False)
def save(self):
self.put()
model.py
@@ -43,50 +43,26 @@ li{list-style:none;margin:0;}
----------end #page-wrapper-------------->
<----------#footer----------------------->
-
-two equal 174px right columns
-#rightsidebar {width: 174px;}
-#content {width: 576px;margin: 0px 15px 0px 0px;}
- */
- body {text-align: center; background-color:; ; margin:0px; padding:0px;}
- body,html {background-colorx:#EEEEEE;height:100%;}
+*/
+body {text-align: center; background-color:; ; margin:0px; padding:0px;}
+body,html {background-colorx:#EEEEEE;height:100%;}
+/* push down the content, same height as footer since it floats */
+.push{height:1em;padding-bottom:0em;}
/*one right column */
-#doc2 {height:100%;margin:0 auto 4.5em;min-height:100%;}
-#doc2 {width:73.076em;}
-#page-wrapper {height:auto !important;margin:0 auto -10em;min-height:100%;clear:both;}
+#doc2 {margin:0 auto 0em;}
+#doc2x {width:73.076em;}
+#page-wrapper {height:auto !important;margin:0 auto -10em;min-height:100%;}
#header {height:4.5em;line-height:2em;overflow:hidden;}
#header ul {list-style-image:none;list-style-position:outside;list-style-type:none;
margin:0 auto;padding:0;display:block;text-align:left;width:73.076em;}
-/*
-
-#hd {height:65px;padding:min-width: 950px;background:#000;}
-#mainnav {height:30px;padding:min-width: 950px;background:#000;}
-#bd #yui-main .yui-b {min-heightx:600px;padding:0px 4px 4px 4px;}
-#doc2 {min-height:100%;height:100%;heightx:auto !important;margin:0 auto 14em;}
-#bd {background-colorxx:#fff;min-height:100%;height:100%;}
-#bd .sidebar {background:;min-height:100%;height:100%;;}
-p {margin:0px 0px 0px 0px;}
-.yui-b {margin:8px 0px 0px 0px;background-color:#fff;}
-.ib {vertical-align: bottom; }
-.yui-t7 #bd {border: red 0px solid;margin:8px 0px 0px 0px;}
-#footer-wrapper {height:14em;width:100%;}
-#ft {width:73.076em;}
-
-#dashboard, #nav ul li a, .fcomments a, #content .post h2 {letter-spacing: 1px;}
-#contentx h3, #comments h3 {margin: 10px;padding: 0px;border-bottom: 1px solid #e5e5e5;font: normal 1.4em Georgia, "Times New Roman", Times, serif;color: #333;}
-#commentsx h3 {margin: 0px 0px 2px;padding:5px;background: #ccc;border-bottom: none;}
-
-
-*/
-
body {font-family:verdana,tahoma,helvetica,arial,sans-serif;}
-
+.clear {clear:both;}
a, a:visited, a:hover {color:#235C9D;}
a, a:visited, a:hover {color:#235C9D;}
-/* Ssearch */
+/* Search */
#searchtop {float: left;border:1px solid #333;}
#searchtop #s {font-size: 1em;padding: 2px 5px;color: #333;border: none;}
#searchform {margin: auto;text-align:center;padding: 0px 0px 10px;}
@@ -135,8 +111,8 @@ a, a:visited, a:hover {color:#235C9D;}
/* Footer Starts */
-#footer {background: #464646;padding: 0px;margin: 0px 0px 0px 0px;padding: 0px 0px 45px 0px;}
-.footerinner {width: 972px;margin:auto;padding: 15px 0px 15px 0px;}
+#footer {height:10em;background: #464646;padding: 0px;margin: 0px 0px 0px 0px;padding: 0px 0px 45px 0px;}
+.footerinner {width: 972px;margin:auto;}
.footerc {float: left;margin: 0px 22px 15px 0px;padding: 2px;width: 303px;color: #dadada;}
.footercalt {float: left;margin: 0px 0px 15px 0px;padding: 2px;width: 303px;color: #dadada;}
.footerc h3, .footercalt h3 {font-size:110%;color: #ccc;margin: 0px;padding:5px;background: #333;letter-spacing: 1px;}
@@ -172,7 +148,7 @@ div.formbox {border:1px solid #8db2e3;margin-top:20px;}
/* Form elements */
/* Colors & Style */
-form {background-color:#FAFAFA; }
+form {background-colorxx:#FAFAFA; }
form fieldset {background-color:#FAFAFA; border-color: #000000; border-width: 0px; border-style: solid;}
form fieldset legend {font-size: 1.3em; font-weight: normal; color: #235C9D;}
input, select, textarea {font-family: Tahoma, Arial, sans-serif; font-size: 1.1em; color: #000000;}
static/potlatch.css
@@ -4,7 +4,6 @@
<title>{% block title %} {{ blog.title }}{% endblock %}</title>
<meta name="generator" content="PotlatchBlog" />
<link rel="stylesheet" href="/static/{{ blog.theme }}" type="text/css" media="screen" />
- <link rel="stylesheet" href="/static/potlatch.css" type="text/css" media="screen" />
<link rel="alternate" type="application/atom+xml" title="{{ blog.title }}" href="{{ blog.feedurl }}" />
<script type="text/javascript" src="/static/jquery-1.2.6.min.js"></script>
<script type="text/javascript" src="{% dsurl %}/js/ds.base.js"></script>
@@ -12,7 +11,7 @@
<link rel="stylesheet" href="{% dsurl %}/css/ds.widgets.css" type="text/css" media="screen" />
<script type="text/javascript" >
jQuery(document).ready(function($) {
- $.ds.defaults.site_slug = 'djangodemo';
+ $.ds.defaults.site_slug = '{{ blog.dsappname }}';
$.ds.defaults.base_url = '{% dsurl %}';
})
</script>
@@ -68,6 +67,7 @@
</div>
</div>
<!-- content Ends -->
+ <div class="push"/>
</div>
<!-- Footer Starts -->
@@ -76,22 +76,17 @@
<div class="footerc">
{{ blog.area1 }}
</div>
-
<div class="footerc">
{{ blog.area2 }}
</div>
-
<div class="footercalt">
{% dsview "feedback" "badge" %}
{{ blog.area3 }}
</div>
-
<div class="clear"></div>
</div>
<div class="footerinner">
- <div id="credits">
- </div>
<div valign="bottom" align="center">
<a href="http://code.google.com/appengine/" >
<img style=" position: relative; top:26px; border:0;" src="http://code.google.com/appengine/images/appengine-noborder-120x30.gif" alt="Powered by Google App Engine" />
views/base.html
@@ -1,5 +1,14 @@
{% extends "_base_public.html" %}
+{% block title %}
+{% if showcomments %}
+{% for entry in entries %}
+ {{ entry.title }}
+{% endfor %} on
+{% endif %}
+{{ blog.title }}
+{% endblock %}
+
{% block featured %}
<!-- Featured Starts -->
{% if featured %}
views/index.html
@@ -15,8 +15,8 @@
<!-- Content Starts -->
<div id="content">
{% for entry in entries %}
- <!-- Post Starts -->
- <h2><a href="/entry/{{ entry.slug }}" rel="bookmark" title="{{ entry.title }}">{{ entry.title }}</a> </h2>
+ <!-- Page Starts -->
+ <h2>{{ entry.title }}</h2>
<!-- Post Starts -->
views/page.html
@@ -75,6 +75,14 @@
<label for="analyticsjs">Comment Javascript:</label>
<textarea name="commentjs" rows="4" cols="60" class="wide">{{ blog.commentjs }}</textarea>
</div>
+ <div class="required">
+ <label for="dsapikey">Demisauce API key:</label>
+ <input type="text" size="100" id="dsapikey" name="dsapikey" value="{{ blog.dsapikey }}">
+ </div>
+ <div class="required">
+ <label for="dsappname">Demisauce App Name:</label>
+ <input type="text" size="100" id="dsappname" name="dsappname" value="{{ blog.dsappname }}">
+ </div>
</fieldset>
<div class="actions">
<input type="submit" class="primaryAction" id="submit" value="Save »">
views/setup.html
c3c03fdd416f55665e5de195efcea03fb9cb3d4f
Aaron Raddon
araddon@yahoo.com
http://github.com/araddon/potlatchblog/commit/2f8f60c0a8da0eae38de6dc62eb81fbdd355a97f
2f8f60c0a8da0eae38de6dc62eb81fbdd355a97f
2009-01-19T16:25:17-08:00
2009-01-19T16:25:17-08:00
updates to use new hosted demisauce.com, and updated ds services, and memcached on gae
c0d8cc8bd1ec8dce5d1886b658d02ea88c46f55a
Aaron Raddon
araddon@yahoo.com