Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://github.com/FredvonHeymann/mathblogging

Conflicts:
	database.tmpl
  • Loading branch information...
commit b523f5406aa465b216cd58c6ee025c1828968267 2 parents c6a4f3f + 5212e4c
@fbreuer fbreuer authored
View
4 bulkloader.yaml
@@ -60,6 +60,10 @@ transformers:
external_name: title
# Type: String Stats: 128 properties of this type in this kind.
+ - property: listtitle
+ external_name: listtitle
+ # Type: String Stats: 128 properties of this type in this kind.
+
- property: type
external_name: type
# Type: String Stats: 128 properties of this type in this kind.
View
12 bytype.tmpl
@@ -19,7 +19,7 @@ $menu
<h2 id="GroupBlogs"> Group Blogs <font size="-1"> <a href="#"> (Back to top) </a> </font> </h2>
<ul class="feedbox-list">
- #for $feed in $qf.get().filter("type =", "groups").order("title")
+ #for $feed in $qf.get().filter("type =", "groups").order("listtitle")
<li>
<div class="feedbox">
<h3> <a href="<%=feed.homepage%>"><%=feed.title%> </a> </h3>
@@ -37,7 +37,7 @@ $menu
<h2 id="IndividualResearchers"> Individual Researchers <font size="-1"> <a href="#"> (Back to top) </a> </font> </h2>
<ul class="feedbox-list">
- #for $feed in $qf.get().filter("type =", "research").order("title")
+ #for $feed in $qf.get().filter("type =", "research").order("listtitle")
<li>
<div class="feedbox">
<h3> <a href="<%=feed.homepage%>"><%=feed.title%> </a> </h3>
@@ -55,7 +55,7 @@ $menu
<h2 id="TeachersAndEducators"> Teachers and Educators <font size="-1"> <a href="#"> (Back to top) </a> </font> </h2>
<ul class="feedbox-list">
- #for $feed in $qf.get().filter("type =", "educator").order("title")
+ #for $feed in $qf.get().filter("type =", "educator").order("listtitle")
<li>
<div class="feedbox">
<h3> <a href="<%=feed.homepage%>"><%=feed.title%> </a> </h3>
@@ -73,7 +73,7 @@ $menu
<h2 id="JournlisticWriters"> Journalistic Writers <font size="-1"> <a href="#"> (Back to top) </a> </font> </h2>
<ul class="feedbox-list">
- #for $feed in $qf.get().filter("type =", "journalism").order("title")
+ #for $feed in $qf.get().filter("type =", "journalism").order("listtitle")
<li>
<div class="feedbox">
<h3> <a href="<%=feed.homepage%>"><%=feed.title%> </a> </h3>
@@ -91,7 +91,7 @@ $menu
<h2 id="Communities"> Communities <font size="-1"> <a href="#"> (Back to top) </a> </font> </h2>
<ul class="feedbox-list">
- #for $feed in $qf.get().filter("type =", "community").order("title")
+ #for $feed in $qf.get().filter("type =", "community").order("listtitle")
<li>
<div class="feedbox">
<h3> <a href="<%=feed.homepage%>"><%=feed.title%> </a> </h3>
@@ -109,7 +109,7 @@ $menu
<h2 id="Institutions"> Institutions <font size="-1"> <a href="#"> (Back to top) </a> </font> </h2>
<ul class="feedbox-list">
- #for $feed in $qf.get().filter("type =", "institution").order("title")
+ #for $feed in $qf.get().filter("type =", "institution").order("listtitle")
<li>
<div class="feedbox">
<h3> <a href="<%=feed.homepage%>"><%=feed.title%> </a> </h3>
View
2  database.tmpl
@@ -1,4 +1,4 @@
title, homepage, person, type, url, comments, priority, subject, favicon
#for $feed in $qf.get().order("type")
"<%=feed.title%>", <%=feed.homepage%>, <%=feed.person%>, <%=feed.type%>,<%=feed.url%>, <%=feed.comments%>, <%=feed.priority%>, <%=feed.subject%>, <%=feed.favicon%>,
-#end for
+#end for
View
5 index.yaml
@@ -23,6 +23,11 @@ indexes:
- kind: Feed
properties:
- name: type
+ - name: listtitle
+
+- kind: Feed
+ properties:
+ - name: type
- name: type
- name: priority
View
1  main.py
@@ -145,6 +145,7 @@ class Feed(db.Model):
url = db.LinkProperty()
homepage = db.StringProperty()
title = db.StringProperty()
+ listtitle = db.StringProperty()
person = db.StringProperty()
subject = db.StringListProperty()
type = db.StringProperty() # can be 'groups', 'research', 'educator', 'micro', 'mathblogging'
Please sign in to comment.
Something went wrong with that request. Please try again.