diff --git a/README b/README index 5efef77..f68d2ef 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ Dynastie is static blog generator delivered under GPL v3 licence terms. -Current version is 0.2 +Current version is 0.5 Requirements : -Django >= 1.4, libapache2-mod-wsgi if you want to use Dynastie with Apache. PyGments (Optional). +Django >= 1.8, libapache2-mod-wsgi if you want to use Dynastie with Apache. PyGments (Optional). Installation : * Download Dynastie diff --git a/apache_dynastie.conf b/apache_dynastie.conf index 700b53e..da10a1e 100644 --- a/apache_dynastie.conf +++ b/apache_dynastie.conf @@ -3,7 +3,9 @@ DocumentRoot /home/soutade/dynastie/dynastie/ - WSGIScriptAlias / /home/soutade/dynastie/dynastie/wsgi.py + WSGIDaemonProcess django-dynastie + WSGIProcessGroup django-dynastie + WSGIScriptAlias / /var/www/dynastie/dynastie/wsgi.py Alias /static /home/soutade/dynastie/dynastie/static diff --git a/dynastie/forms.py b/dynastie/forms.py index 9cdd355..94e2447 100755 --- a/dynastie/forms.py +++ b/dynastie/forms.py @@ -24,6 +24,7 @@ from dynastie.models import * class BlogForm(ModelForm): class Meta: model = Blog + exclude = () class PostForm(ModelForm): description = forms.CharField(widget=forms.Textarea(attrs={'rows':'5', 'cols':'50'}), required=False) @@ -51,6 +52,7 @@ class CategoryForm(ModelForm): class UserForm(ModelForm): class Meta: model = User + exclude = ('groups', 'user_permissions', 'date_joined') class CommentForm(ModelForm): class Meta: diff --git a/dynastie/models.py b/dynastie/models.py index 207189c..ffab2a6 100755 --- a/dynastie/models.py +++ b/dynastie/models.py @@ -116,7 +116,9 @@ class Blog(models.Model): if os.path.isdir(srcname): if not os.path.exists(dstname): os.makedirs(dstname) - self.copytree(srcname, dstname) + self.copytree(srcname, dstname, ignore=True) + else: + return self.copytree(srcname, dstname) else: copied = False if os.path.exists(dstname): diff --git a/dynastie/templates/add_post.html b/dynastie/templates/add_post.html index 2f418a3..54d86c9 100755 --- a/dynastie/templates/add_post.html +++ b/dynastie/templates/add_post.html @@ -68,7 +68,10 @@ Available tags:
#[Inline Picture](https://bits.wikimedia.org/images/wikimedia-button.png)
Picture
[Link](http://www.wikipedia.org)
Link

-    Code : 4 whitespaces ahead
+    Code : 4 whitespaces ahead OR
+    ```language
+    Code
+    ```
 
diff --git a/dynastie/templates/edit_draft.html b/dynastie/templates/edit_draft.html index 6fba912..31cd9e1 100644 --- a/dynastie/templates/edit_draft.html +++ b/dynastie/templates/edit_draft.html @@ -67,7 +67,10 @@ Available tags:
#[Inline Picture](https://bits.wikimedia.org/images/wikimedia-button.png)
Picture
[Link](http://www.wikipedia.org)
Link

-    Code : 4 whitespaces ahead
+    Code : 4 whitespaces ahead OR
+    ```language
+    Code
+    ```
 
diff --git a/dynastie/templates/edit_post.html b/dynastie/templates/edit_post.html index 473c2b2..cc37380 100755 --- a/dynastie/templates/edit_post.html +++ b/dynastie/templates/edit_post.html @@ -80,7 +80,10 @@ Available tags:
#[Inline Picture](https://bits.wikimedia.org/images/wikimedia-button.png)
Picture
[Link](http://www.wikipedia.org)
Link

-    Code : 4 whitespaces ahead
+    Code : 4 whitespaces ahead OR
+    ```language
+    Code
+    ```