From 787a929eb5276992f02b84beee7e7a853d95e702 Mon Sep 17 00:00:00 2001 From: Stefan Koegl Date: Sun, 7 Mar 2010 23:17:26 +0100 Subject: [PATCH] restructure file layout --- __init__.py => ochimeru/__init__.py | 0 {cards => ochimeru/cards}/__init__.py | 0 {cards => ochimeru/cards}/admin.py | 0 {cards => ochimeru/cards}/models.py | 2 ++ {cards => ochimeru/cards}/templates/answer.html | 0 {cards => ochimeru/cards}/templates/base.html | 0 {cards => ochimeru/cards}/templates/card.html | 0 {cards => ochimeru/cards}/templates/level.html | 0 {cards => ochimeru/cards}/templates/login.html | 0 {cards => ochimeru/cards}/tests.py | 0 {cards => ochimeru/cards}/views.py | 0 manage.py => ochimeru/manage.py | 0 ochimeru/ochimeru | Bin 0 -> 36864 bytes settings.py => ochimeru/settings.py | 5 ++++- urls.py => ochimeru/urls.py | 0 server.fcgi | 16 ++++++++++++++++ static/{ => media}/screen.css | 0 __init__.py => static/ochimeru | 0 static/server.fcgi | 1 + 19 files changed, 23 insertions(+), 1 deletion(-) copy __init__.py => ochimeru/__init__.py (100%) rename {cards => ochimeru/cards}/__init__.py (100%) rename {cards => ochimeru/cards}/admin.py (100%) rename {cards => ochimeru/cards}/models.py (87%) rename {cards => ochimeru/cards}/templates/answer.html (100%) rename {cards => ochimeru/cards}/templates/base.html (100%) rename {cards => ochimeru/cards}/templates/card.html (100%) rename {cards => ochimeru/cards}/templates/level.html (100%) rename {cards => ochimeru/cards}/templates/login.html (100%) rename {cards => ochimeru/cards}/tests.py (100%) rename {cards => ochimeru/cards}/views.py (100%) rename manage.py => ochimeru/manage.py (100%) create mode 100644 ochimeru/ochimeru rename settings.py => ochimeru/settings.py (97%) rename urls.py => ochimeru/urls.py (100%) create mode 100755 server.fcgi rename static/{ => media}/screen.css (100%) rename __init__.py => static/ochimeru (100%) create mode 120000 static/server.fcgi diff --git a/__init__.py b/ochimeru/__init__.py similarity index 100% copy from __init__.py copy to ochimeru/__init__.py diff --git a/cards/__init__.py b/ochimeru/cards/__init__.py similarity index 100% rename from cards/__init__.py rename to ochimeru/cards/__init__.py diff --git a/cards/admin.py b/ochimeru/cards/admin.py similarity index 100% rename from cards/admin.py rename to ochimeru/cards/admin.py diff --git a/cards/models.py b/ochimeru/cards/models.py similarity index 87% rename from cards/models.py rename to ochimeru/cards/models.py index b76e716..d3d1bb0 100644 --- a/cards/models.py +++ b/ochimeru/cards/models.py @@ -5,6 +5,8 @@ class Card(models.Model): question = models.CharField(max_length=100) answer = models.CharField(max_length=100) + def __unicode__(self): + return self.question class CardStatus(models.Model): card = models.ForeignKey(Card) diff --git a/cards/templates/answer.html b/ochimeru/cards/templates/answer.html similarity index 100% rename from cards/templates/answer.html rename to ochimeru/cards/templates/answer.html diff --git a/cards/templates/base.html b/ochimeru/cards/templates/base.html similarity index 100% rename from cards/templates/base.html rename to ochimeru/cards/templates/base.html diff --git a/cards/templates/card.html b/ochimeru/cards/templates/card.html similarity index 100% rename from cards/templates/card.html rename to ochimeru/cards/templates/card.html diff --git a/cards/templates/level.html b/ochimeru/cards/templates/level.html similarity index 100% rename from cards/templates/level.html rename to ochimeru/cards/templates/level.html diff --git a/cards/templates/login.html b/ochimeru/cards/templates/login.html similarity index 100% rename from cards/templates/login.html rename to ochimeru/cards/templates/login.html diff --git a/cards/tests.py b/ochimeru/cards/tests.py similarity index 100% rename from cards/tests.py rename to ochimeru/cards/tests.py diff --git a/cards/views.py b/ochimeru/cards/views.py similarity index 100% rename from cards/views.py rename to ochimeru/cards/views.py diff --git a/manage.py b/ochimeru/manage.py similarity index 100% rename from manage.py rename to ochimeru/manage.py diff --git a/ochimeru/ochimeru b/ochimeru/ochimeru new file mode 100644 index 0000000000000000000000000000000000000000..bce29befac33b478808b76feb6fe5aab1c60663c GIT binary patch literal 36864 zcwX&Ydu$v>8K2qNy|vHp$9Zj^9k1;;$;ozn7u#{2P#Tk5P>ACYCy^Q<^|ZNLJLlZP zxjj3H1d(i)ia#i-pp_~RQjri);4h@|5LHzP{z9lAA))+HkU&(4L_k8kq!s})v#;5` zJv&ZFgL3op`SZ*--^{o3`u1k#TkrXE^VzblE)`38t*lN05kLrzsVV^Aqri&}{0o^l z8{QTY`9*g~a0q>X{(=62?wL`J2SOqgQj!A@WD6PnhH)*2doZP~m5Ve^LRV62hF(e~ zoS?kXh-77O5N@Q)+U1;16P8QGwN*DH9$!q(T}Y}I<~}x`REOMzA@x95#Td$FhSY4K ztS{>&b>ZvZUty!y$-Q)lKDFR7=Km&Q!7f|l2Z)OD?tzM_>5JQa_*!WS1#ox7L} z$0o&)^6|lKYd}?7RiI&Mvl+_D=qTJe@77^eFXgj_ku4T{Q6Zo=RhW6Rg+Fbml#%;>&0N6yw_$=Qm`sM_jW4b^1{QFUf`qD2Bn zVS>?U4HcCP70FU-@d#_8*~wt3_GGa1GZ|t{P9M;&WTk1Bx}y6U{ngLotJIct(Yg*R zy05`seOt~_Z$;Ixr~0-K(P~T7`#Y2vIb^9LVYSZRp;W?BM8dtYr$cEnQ9%MjAqk9| zqsl6uS|GtvU|L1Vk+C$GGL{M&=@TWe9}d_$OaY>VhQ^QtX5a*)#WhgSQsr{S1V`G^ z$4FaBUCut}v^CMph!XWQisx%zPZ-lZ@LK@=5&a7N7<~u5iav|hQ3frdV`vn0At2ll z-VxpuzA1cB*b=S@DPdkXET}>o{15ySyba&RnK>Rg6cJ9qusyG_IW@{!dCk~k^6lyC z@cTPOY^}q#?KPQwZ6X|o^-LjAlfz{1Z5Clabc}XSM1-TzZ=btOuFn)J?IIk39>d#3 z%V!O3#N;rBwUcUeY-tC*a-ZRBH59Z2A8+`)ogHm+!iy@`w#pV~WhI6XVFG?iF7JT;rqX5)HdCOxH1 zPfyLxPR`EEq-WC8Q)%sT0vC5Eo`{dfC&%M6>Y@0Nc>Kup;e)e>rl)7()ls0D;k4>WBKUH?m90Du7)heh~rVG_Q2R?GaRklvAn7x@N;TUe~6Oyb9 z48RwdI*@HFClCs#0o_&KWd%qcZzU!xD`CklWlKgmRbAQ=%W3x`rRTM5&Xt&%u8>&O z4C8vSlwroyp{FXOvPQ}%YfDQ*>g8fF7m%u@%h`3kYO=A0hmP5DK@zkwx#Dsb&#jDB z*2~$v?w29_)C%rUJrf`lj*p z2;4m54peKGmJNpkhO3qIAR{)=6se2JlgY*8!tvyJ?}Q*F$E@6r(z1S|%=FP_bDgYA zPQtC@v>urit*~57v4$#u)!?mFfW&Sqx1$Xm(pFbfIqkBZ+g>b>?dkR+jx}~m9JBLb zBb=-cDVHXzjfH@!rV;_nMl!6FSPX7@+SNKs@Wz?~ThmH(8q$iVuIe}4>P@jWtFl$? zJa}$uzMi+O(T&w?Nhbn&;1oXE5K_*@c4!S-O~M;*=KKE~9JLEF|HHyx0s0;KIr>ppA$vHl*ABrq~E%sN#u?gs`FRzzG(B+7hkwSsL3 z>x@L~g%|nTAxJ=pD9(D42Ku1{1|x&sMY|g#`+s3{5}+0I8}t^shkk)Rg-)Wcq0ghw z?9`AP92^9lqB015RwUdkDiN1i-!3Zs&|^00sDxuNY84|< z$QT8&NsL6GZ4Xeh7*U{O34{(YG6=oXpZouCaMUok{|^U8?ZWi``2)Zo4i1hd5WP?Y z!^8RwEx(%652lNGCP?N#0`~y82fu>Og1cZb_{qNehPahzl9lms_(Fs|RiO(Xa#-n) zw*{W8ILW&`q#`G(#X^c4k$4VE$dzr3HOk8HFx(vQocG|R7ZYp=KIzGpcYR)#DdshD zG`rnVSam0daP0rHAw8G>aOa&>9XQy`!3URYF~!R(db&&tAjfB3Zb@G)xea_M=+M%v z=u%F@ZDi!NTn=A`x>hi<%LP5-m-asXQ*l(gaj=>CcWmybeMVRRDQ6>*hT6UT+ zV%2M<5?+}4Jha2H&5yLo%IqwBzQgC~&pZxb1al+Ro&aElcH5k00r%G+_TvU@i!e_$ z++QJ{CqI~y9N%8&ipKn<$HKAGZ6PH!dmm3GFipZfrNHvLHoM#DK;H5_v0#cC{{o&1r4>D#n;1V|@M3!BNZL=l>iWwF`d#=isPa@cTapN9}^{|G^gl zd=b8by3keh68Ne|V57ZDR!)z?jiYqy#kaMS^7(N1lJ{6UDW?`rB%iI=7xHHwQqL}U zgl=`q%G2X;V}Ppmd$gpiEe$_k^(w8F&D0j)CgW_C#GdI0Dd)#`{+|Qpz7X@T2P{ta zX0lUO=H}q@5#PoWCH{@TwGUfgP)cvL%`d;;hr12-zu$gjHpD7+AJ0cZ%JSUK9pP^i zwoCkJ(Z@NH>~`?W@%=vzjv5C4{?EZtyCC=f9QNsaogAid!-`qf^)6{Hf3O8WjUG!M}G=x^xH=q~y_dKdi~{Sy5Q{S>{0eu%z@ zzKgzrUPE6-FQYG@&!J8HEnyw4q7`f_o+C-?>NNEG5VM0+orFE3bgbE=_B}zp? zA)-{E6!P^y2S@FK&wmb%+6ABg92~U^y8j2S1L3-G2Q9;Y;vmPP$E_&q+2nsz(sohu z^Y?n4K&oXky*~n;zjQsDZuM@f-+K1a&mZ1Fzw^juHT||gtf0us^a$K&ab01ot$n)^ zEN>vd`Nb#Bc)YmpZei;Cm_5lhx_V^g48DM8f-k`5m*Y<#+~Gn3-G72EsKWn;-~Tx{ NY8QO|b8yry{tG`S3{e08 literal 0 HcwPel00001 diff --git a/settings.py b/ochimeru/settings.py similarity index 97% rename from settings.py rename to ochimeru/settings.py index 21dcc63..dc1053f 100644 --- a/settings.py +++ b/ochimeru/settings.py @@ -47,7 +47,7 @@ MEDIA_URL = '' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. # Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/media/admin/' +ADMIN_MEDIA_PREFIX = '/media-admin/' # Make this unique, and don't share it with anybody. SECRET_KEY = '^!y=#+*a92zv78+nsx_6*1de^v@*=8fcv&ab%-4067t@t$3kc5' @@ -81,3 +81,6 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'ochimeru.cards', ) + +SERVER_EMAIL = 'stefan@skoegl.net' + diff --git a/urls.py b/ochimeru/urls.py similarity index 100% rename from urls.py rename to ochimeru/urls.py diff --git a/server.fcgi b/server.fcgi new file mode 100755 index 0000000..6449247 --- /dev/null +++ b/server.fcgi @@ -0,0 +1,16 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +import sys +import os + +# Add this directory as custom Python path +sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) + +# Set the DJANGO_SETTINGS_MODULE environment variable +os.environ['DJANGO_SETTINGS_MODULE'] = 'ochimeru.settings' + +# Start the FastCGI server for this application +from django.core.servers.fastcgi import runfastcgi +runfastcgi(method='threaded', daemonize='false') + diff --git a/static/screen.css b/static/media/screen.css similarity index 100% rename from static/screen.css rename to static/media/screen.css diff --git a/__init__.py b/static/ochimeru similarity index 100% rename from __init__.py rename to static/ochimeru diff --git a/static/server.fcgi b/static/server.fcgi new file mode 120000 index 0000000..82c45a8 --- /dev/null +++ b/static/server.fcgi @@ -0,0 +1 @@ +../server.fcgi \ No newline at end of file -- 2.11.4.GIT