Permalink
Browse files

v0.2.0b

  • Loading branch information...
1 parent fdc5028 commit 58a8488252d465b33b6466beea9b5266c4e7e850 Andrii Pryz committed Aug 18, 2013
@@ -1,13 +1,17 @@
-2013-05-15 Version 0.1.0
+2013-08-18 Version 0.2.0b
++ New type of page: "inner_page"
++ Embedding videos from youtube
+* Improved usability admin
+* Some refuctoring code
+* Temporarily disable parameter MAX_NUM_PAGE
+
+2013-05-15 Version 0.1.0
* Fixed one bug in Sitemap.xml
* Fixed some bugs and inconveniences
2013-04-19 Version 0.1.0b
-
* First beta!
-
2012-12-01 Version 0.0.0
-
* Start idea the project!
View
@@ -7,12 +7,4 @@ Redistribution and use in source and binary forms, with or without modification,
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3. Neither the name of the MySmile nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
@@ -0,0 +1,26 @@
+Metadata-Version: 1.1
+Name: MySmile
+Version: 0.2.0b
+Author: Andrii Pryz
+Author-email: info at mysmile com ua
+Home-page: http://mysmile.com.ua
+Summary: It is CMS based on Django aimed to the quality content.
+License: BSD
+Download-URL: UNKNOWN
+Description: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Django
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Natural Language :: English
+Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Ukranian
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.2
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
+Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
View
@@ -1,38 +0,0 @@
-MySmile --- simple CMS based on Django.
-
------------------------------------------------------
-Dependences
------------------------------------------------------
-
-a) Django 1.5.x: https://github.com/django/django, http://djangoproject.com
-b) PIL library for working with images: https://github.com/python-imaging/Pillow
-
------------------------------------------------------
-Installation
------------------------------------------------------
-
-1. Unpack archive with MySmile to the project directory
-2. In the project directory run a command in the terminal:
-
- python3 manage.py runserver
-
- Now demo is available here http://127.0.0.1:8000
-
-3. Change default credentials to admin page:
- 3.1. Link to admin page: http://127.0.0.1:8000/admin
- 3.2. Default credentials: login: test, password: test
-
-4. Let’s start create your own project:
- 4.1. Upload new logo to the "/static/images/" folder
- 4.2. Update content using agmin page
- 4.3. Change user_settings.py
-
-
------------------------------------------------------
-Documentation
------------------------------------------------------
-
-For more information please visit: http://mysmile.com.ua/en/documentation.html
-
-Welcome to MySmile!
-
View
@@ -0,0 +1,4 @@
+MySmile is a simple CMS based on Django.
+
+Documentation is available at http://mysmile.com.ua/documentation
+
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -1,10 +1,15 @@
-# Django settings for my project.
+# Django settings for mysmile project.
+from mysmile import user_settings
import os
SITE_ROOT = os.path.realpath(os.path.dirname(__file__))
DEBUG = True
+# Hosts/domain names that are valid for this site; required if DEBUG is False
+# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
+ALLOWED_HOSTS= ['127.0.0.1', 'demo.mysmile.com.ua', 'www.demo.mysmile.com.ua']
+
TEMPLATE_DEBUG = DEBUG
ADMINS = (
@@ -15,8 +20,9 @@
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(SITE_ROOT, 'db/mysmile.sqlite3'),
+ 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
+ 'NAME': os.path.join(SITE_ROOT, 'db/mysmile.sqlite3'),
+ # Or path to database file if using sqlite3.
'OPTIONS': '',
# The following settings are not used with sqlite3:
'USER': '',
@@ -26,10 +32,6 @@
}
}
-# Hosts/domain names that are valid for this site; required if DEBUG is False
-# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = []
-
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
@@ -67,7 +69,8 @@
# Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/var/www/example.com/static/"
-STATIC_ROOT =''#os.path.join(SITE_ROOT, 'static/')
+
+STATIC_ROOT = os.path.join(SITE_ROOT, '')
# URL prefix for static files.
# Example: "http://example.com/static/", "http://static.example.com/"
@@ -91,7 +94,7 @@
)
# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'W3/^x=+JnorlH9#=DpIkfVqq(&)6Pe+8!Szw8621W0gKZ=I7)AE'
+SECRET_KEY = 'eghg&6Tr%jh#kleT7YoOW3/^x=0JT+8!Sz08621W0gKZ=I7(01'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
@@ -100,6 +103,9 @@
# 'django.template.loaders.eggs.Loader',
)
+
+SESSION_ENGINE = 'django.contrib.sessions.backends.db'
+
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
@@ -110,6 +116,8 @@
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
+
+
ROOT_URLCONF = 'mysmile.urls'
# Python dotted path to the WSGI application used by Django's runserver.
@@ -154,16 +162,17 @@
},
'handlers': {
'mail_admins': {
- 'level': 'ERROR',
+ 'level': 'DEBUG',
'filters': ['require_debug_false'],
'class': 'django.utils.log.AdminEmailHandler'
}
},
'loggers': {
'django.request': {
'handlers': ['mail_admins'],
- 'level': 'ERROR',
+ 'level': 'DEBUG',
'propagate': True,
},
}
}
+
@@ -1,8 +1,8 @@
@charset "utf-8";
html, body { margin: 0; padding: 0; border: 0; }
-body { font-family: Georgia, "Times New Roman", serif; font-size: 14px; }
-
+body { font-family: Georgia, "Times New Roman", serif; font-size: 12px; }
+body a{ text-decoration: none;}
a img { border: 0; }
h1 { margin: 58px 0 0 145px; font-family: Arial, Helvetica, sans-serif; }
h1 a{ text-decoration: none; color: #555; }
@@ -11,86 +11,82 @@ h2 { text-align: center; }
#carrier{ width: 998px; margin: 0 auto; overflow: hidden; }
-.clear{ clear:both; }
+.clear { clear:both; }
-#logo{ float: left; padding: 5px 10px;}
+#logo { float: left; padding: 5px 10px;}
header { border-right: 1px solid #999; }
-header nav{ float: left; font-family: Arial, Helvetica, sans-serif;}
+header nav { float: left; font-family: Arial, Helvetica, sans-serif; }
-header nav ul{ margin: 0 0 0 20px; padding: 0; list-style: none; list-style-position: outside; }
-header nav li{ float: left; font-size: 18px; padding: 5px;}
-header nav li a{ padding: 10px; color: #333; text-decoration: none; }
+header nav ul { margin: 0 0 0 20px; padding: 0; list-style: none; list-style-position: outside; }
+header nav li { float: left; font-size: 18px; padding: 5px; }
+header nav li a { padding: 10px; color: #333; text-decoration: none; }
header nav .active, header nav li:hover { border-right: 1px solid #999; border-bottom: 1px solid #999; border-left: 1px solid #999; border-bottom-right-radius: 20px; border-bottom-left-radius: 20px; }
+#inav { float: left; width:650px; margin-top:5px; list-style: none; list-style-position: outside; font-family: Arial, Helvetica, sans-serif; }
+#inav li { width: auto; float: left; text-align: center; font-size: 11px; padding-right: 10px;}
+#inav li a { padding: 0 5px; color: #333; text-decoration: none; }
+#inav .active a { border-bottom: 2px solid #FB9F31; }
+
+
#line_top{ height: 23px; width: 860px; margin: 0 0 0 148px; border-left: 1px solid #999; border-right: 1px solid #999;}
#lang { float: right; margin-right: 10px; }
#lang img { margin-right: 5px; }
-#contact{ float:right; margin: -85px 2px 0 0; padding: 0; list-style: none; }
-#contact li{ padding: 2px; }
-#contact li img{ padding-right:2px; vertical-align: middle; }
+#contact { float:right; margin: -85px 2px 0 0; padding: 0; list-style: none; }
+#contact li { padding: 2px; }
+#contact li img { padding-right:2px; vertical-align: middle; }
#line_left{ height: 350px; width: 5px; float: left; border-top-right-radius: 20px; border-bottom-right-radius: 20px; padding-right: 15px; padding-top:0; margin-right:10px; border-right: 1px solid #999; border-bottom: 1px solid #999; }
article{ text-align: justify; border-left: 1px solid #999; border-bottom: 1px solid #999; border-right: 1px solid #999; }
article h1{ margin: 0; padding: 0; }
article p{ line-height:150%; text-indent: 12px; margin-top: 0;}
-#col_right{ width: 333px; float:right; margin-left: 10px; border-top: 2px solid #999; border-left: 1px solid #999; border-bottom: 1px solid #999; }
+#col_right { width: 333px; float:right; margin-left: 10px; border-top: 2px solid #999; border-left: 1px solid #999; border-bottom: 1px solid #999; }
.col_right_text { padding: 10px 10px 10px 10px; }
.col_central_text { padding: 5px 10px 10px 10px; }
-#col_bottom{ border-top: 2px solid #999; border-right: 1px solid #999; border-bottom: 1px solid #999; border-left: 1px solid #999; background-color: #E6E6E6; }
-.col_bottom{ float:left; padding: 5px 10px 5px 10px; }
-.col_bottom_3{ width: 310px; }
-.col_bottom_2{ width: 476px;}
-.col_bottom_1{ width: auto; }
+#col_bottom { border-top: 2px solid #999; border-right: 1px solid #999; border-bottom: 1px solid #999; border-left: 1px solid #999; background-color: #E6E6E6; }
+.col_bottom { float:left; padding: 5px 10px 5px 10px; }
+.col_bottom_3 { width: 310px; }
+.col_bottom_2 { width: 476px;}
+.col_bottom_1 { width: auto; }
/*footer*/
-footer{ height: 30px; font-size: 11px; background-color: #999; color: #FFFFFF}
-footer ul{ padding: 0; text-align:left; list-style: none; display: inline; }
-footer li{ float: left; padding: 5px;}
-footer a{ color: #FFF; text-decoration: none }
-footer a:hover{ text-decoration: underline;}
-footer div{ float: right; padding: 5px; font-weight: bold; }
+footer { height: 30px; font-size: 11px; background-color: #999; color: #FFFFFF}
+footer ul { padding: 0; text-align:left; list-style: none; display: inline; }
+footer li { float: left; padding: 5px;}
+footer a { color: #FFF; text-decoration: none }
+footer a:hover { text-decoration: underline;}
+footer div { float: right; padding: 5px; font-weight: bold; }
#line_bottom { height: 2px; margin-top: -4px; background-color: #E6E6E6; }
-#version{ float:right; margin: 5px 0 5px 0; font-size: 10px; }
+#version { float:right; margin: 5px 0 5px 0; font-size: 10px; }
+li{line-height: 1.5;}
/*download button*/
-button.css3button {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 13px;
- color: #555555;
- padding: 7px 10px;
- background: -moz-linear-gradient(
- top,
- #fda132 0%,
- #f58c13);
- background: -webkit-gradient(
- linear, left top, left bottom,
- from(#fda132),
- to(#f58c13));
- -moz-border-radius: 8px;
- -webkit-border-radius: 8px;
- border-radius: 8px;
- border: 1px solid #555555;
- -moz-box-shadow:
- 0px 1px 3px rgba(000,000,000,0.5),
- inset 0px 0px 4px rgba(255,255,255,1);
- -webkit-box-shadow:
- 0px 1px 3px rgba(000,000,000,0.5),
- inset 0px 0px 4px rgba(255,255,255,1);
- box-shadow:
- 0px 1px 3px rgba(000,000,000,0.5),
- inset 0px 0px 4px rgba(255,255,255,1);
- text-shadow:
- 0px -1px 0px rgba(000,000,000,0.7),
- 0px 1px 0px rgba(255,255,255,0.3);
-}
-
-
+button.css3button { width:275px; font-family: Arial, Helvetica, sans-serif; font-size: 14px; color:
+#555; padding: 7px 10px; background: -moz-linear-gradient(top,#86c041 0%, #86c041); background:
+-webkit-gradient(linear, left top, left bottom, from(#86c041), to(#86c041)); -moz-border-radius:
+8px; -webkit-border-radius: 8px; border-radius: 8px; border: 1px solid #555555; -moz-box-shadow: 0px
+1px 3px rgba(000,000,000,0.5), inset 0px 0px 4px rgba(255,255,255,1); -webkit-box-shadow: 0px 1px
+3px rgba(000,000,000,0.5), inset 0px 0px 4px rgba(255,255,255,1); box-shadow: 0px 1px 3px
+rgba(000,000,000,0.5), inset 0px 0px 4px rgba(255,255,255,1); text-shadow: 0px -1px 0px
+rgba(000,000,000,0.7), 0px 1px 0px rgba(255,255,255,0.3); cursor: pointer; }
+
+/*demo button*/
+button.demo3button { width:275px; font-family: Arial, Helvetica, sans-serif; font-size: 14px;
+font-weight:bolder; color: #fff; padding: 7px 7px; background: -moz-linear-gradient(top,#0088e0 0%,
+#0088e0); background: -webkit-gradient(linear, left top, left bottom, from(#0088e0), to(#0088e0));
+-moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; border: 1px solid #555555;
+-moz-box-shadow: 0px 1px 3px rgba(000,000,000,0.5), inset 0px 0px 4px rgba(255,255,255,1);
+-webkit-box-shadow: 0px 1px 3px rgba(000,000,000,0.5), inset 0px 0px 4px rgba(255,255,255,1);
+box-shadow: 0px 1px 3px rgba(000,000,000,0.5), inset 0px 0px 4px rgba(255,255,255,1); text-shadow:
+0px -1px 0px rgba(000,000,000,0.7), 0px 1px 0px rgba(255,255,255,0.3); cursor: pointer; }
+
+/*form*/
+#demoform, #downform, #donateform { margin: 10px auto; text-align: center; }
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,4 +1,2 @@
-<h1><a href="#">Error 404: page not found...</a></h1>
-<p>Click another page, please!</p>
-
-
+<h1>Error 404: page not found...</h1>
+<p>Return to <a href="http://mysmile.com.ua">home page!</a></p>
@@ -1,4 +1,4 @@
-<h1><a href="#">Error 500: internal server error</a></h1>
-<p>Click another page, please!</p>
+<h1>Fatal server 500 error!</h1>
+<p>all is down... Return to <a href="http://mysmile.com.ua">home page!</a></p>
Oops, something went wrong.

0 comments on commit 58a8488

Please sign in to comment.