Skip to content

Commit 8c7b2cb

Browse files
youenyouen
committed
Merge branch 'master' of ssh://djity.net/srv/web/git/djity
2 parents 56cc48f + b7f8a66 commit 8c7b2cb

File tree

5 files changed

+75
-8
lines changed

5 files changed

+75
-8
lines changed

‎README.rst

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,34 @@ Links
2727
Homepage (roadmap, bug reports, etc.): http://redmine.djity.net/projects/djityportal
2828
Git page (forks, patches, etc.): https://github.com/djity/djity
2929
Official documentation: http://pypi.python.org/pypi/djity
30+
31+
Features
32+
========
33+
34+
* Projects tree (multiple projects on the same site, with different styles,
35+
users, etc.)
36+
* Users management (subscriptions, login, roles in projects, etc.)
37+
* 100% Ajax interface
38+
* Pluggable applications (instanciated in tabs of projects)
39+
* Easy generation of new Django instances and applications (using Skeleton)
40+
* Easy Ajax application developement (custom shortcuts and proxy objects based
41+
on Dajax and Dajaxice, integration of jquery and jquery-ui)
42+
* Enriched contextual dictionary both server and client side (with information about the current session,
43+
project, tab, users permissions, etc)
44+
* Online edition of the styles of the projects (using a custom themeroller
45+
inspired by jquery-ui)
46+
* Contextual portlets (per project and per instance of application in a
47+
project)
48+
* Easy internationalization of interface and user content (using i18n, django-localeurl and django-transmeta)
49+
* Rich WYSIWYG HTML edition wherever you want it (using eLRTE)
50+
51+
Incoming features
52+
=================
53+
54+
* Online administration of the portlets
55+
* Fully themable projects (not just some style parameters, but also the layouts)
56+
* Easy migration of data between versions (probably using South)
57+
* Integrated search engine (probably using Haystack)
58+
* User identification through OpenID
59+
* Recent advanced Web standards (PUSH, Websockets, etc)
60+
* Open data linking using standard ontologies (FOAF, SIOC, etc)

‎djity/project_skeleton/style_settings.py_tmpl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ DEFAULT_STYLE = [
44
["background_color", "#ffffff"],
55
["content_background_color", "#ffffff"],
66
["content_border_color", "#e65959"],
7-
["corner_radius", "5px"],
7+
["content_text_color", "#000000"],
88
["font_family", "Verdana,Arial,sans-serif"],
99
["font_size", "1.1em"],
10+
["content_font_family", "Verdana,Arial,sans-serif"],
11+
["content_font_size", "1.1em"],
1012
["border_color", "#696969"],
1113
["border_radius", "10px"],
1214
["corner_radius", "5px"],
@@ -131,9 +133,12 @@ EDIT_STYLE_ORDER = [
131133
("Border shadow","border_shadow"),
132134
("Content background","content_background_color"),
133135
("Content border","content_border_color"),
136+
("Content text color","content_text_color"),
137+
("Interface font family","font_family"),
138+
("Interface font size","font_size"),
139+
("Content font family","content_font_family"),
140+
("Content font size","content_font_size"),
134141
("Buttons corner radius","corner_radius"),
135-
("Font family","font_family"),
136-
("Font size","font_size"),
137142
("Overlay background color","overlay_background_color"),
138143
("Overlay background texture","overlay_background_texture"),
139144
("Overlay background percent","overlay_background_percent"),

‎djity/templates/djity/style/jquery-ui.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747

4848
/* Component containers
4949
----------------------------------*/
50-
.ui-widget { font-family: {{ font_family }}; font-size: {{ font_size }}; }
50+
/*.ui-widget { font-family: {{ font_family }}; font-size: {{ font_size }}; }
5151
.ui-widget .ui-widget { font-size: 1em; }
52-
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: {{ font_family }}; font-size: 1em; }
52+
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: {{ font_family }}; font-size: 1em; }*/
5353
.ui-widget-content {
5454
border: 1px solid {{ wcontent_border_color }};
5555
background: {{ wcontent_background_color }} url({% url texture project_name=project_name %}?filename={{ wcontent_background_texture }}&bg_color={{ wcontent_background_color|urlencode}}&percent={{ wcontent_background_percent }}) 50% 50% repeat;

‎djity/templates/djity/style/project.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ body {
3232
}
3333

3434
#top_container{
35+
font: {{ font_size }} {{ font_family }};
3536
border: 1px solid {{ border_color }};
3637
border-radius: {{ border_radius }};
3738
-moz-border-radius: {{ border_radius }};
@@ -52,6 +53,7 @@ body {
5253
}
5354

5455
#content {
56+
font: {{ content_font_size }} {{ content_font_family }};
5557
margin-left:-100%;
5658
width:100%;
5759
}
@@ -70,7 +72,7 @@ html>body #main {
7072
}
7173

7274
#sap-content {
73-
padding:0 215px 5px 165px;
75+
padding:0 215px 5px 215px;
7476
margin:5px;
7577
color:black;
7678
border:0;
@@ -131,7 +133,7 @@ html>body #main {
131133
margin:5px 10px 5px 10px;
132134
color: {{ title_color }};
133135
font: {{ title_font_size }} {{ title_font_family }};
134-
background: {{ title_background_color }} url({% url texture project_name=project_name %}?filename={{ title_background_texture }}&bg_color={{ title_background_color|urlencode}}&percent={{ title_background_percent }}) 50% 50% repeat;
136+
background: {{ title_background_color }} url({% url texture project_name=project_name %}?filename={{ title_background_texture }}&bg_color={{ title_background_color|urlencode}}&percent={{ title_background_percent }}) 50% 50% repeat;
135137
text-shadow: {{ title_color }} 1px 1px {{ title_text_shadow }};
136138
border: {{ title_border_width }} solid {{ title_border_color }};
137139
-moz-border-radius: {{ title_border_radius }};
@@ -302,7 +304,7 @@ html>body #main {
302304
#left{
303305
background:none repeat scroll 0 0;
304306
margin-left:-100%;
305-
width:150px;
307+
width:200px;
306308
z-index:90;
307309
}
308310

‎docsrc/source/index.rst

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,36 @@ We are focused on Web development using the latest standards (HTML5, CSS3, etc.)
1616
.. warning::
1717
Djity is still in an early development phase. If you are willing to look into it you should be prepared for gaps in functionalities and documentation, and for the occasional bug.
1818

19+
Features
20+
--------
1921

22+
* Projects tree (multiple projects on the same site, with different styles,
23+
users, etc.)
24+
* Users management (subscriptions, login, roles in projects, etc.)
25+
* 100% Ajax interface
26+
* Pluggable applications (instanciated in tabs of projects)
27+
* Easy generation of new Django instances and applications (using Skeleton)
28+
* Easy Ajax application developement (custom shortcuts and proxy objects based
29+
on Dajax and Dajaxice, integration of jquery and jquery-ui)
30+
* Enriched contextual dictionary both server and client side (with information about the current session,
31+
project, tab, users permissions, etc)
32+
* Online edition of the styles of the projects (using a custom themeroller
33+
inspired by jquery-ui)
34+
* Contextual portlets (per project and per instance of application in a
35+
project)
36+
* Easy internationalization of interface and user content (using i18n, django-localeurl and django-transmeta)
37+
* Rich WYSIWYG HTML edition wherever you want it (using eLRTE)
38+
39+
Incoming features
40+
-----------------
41+
42+
* Online administration of the portlets
43+
* Fully themable projects (not just some style parameters, but also the layouts)
44+
* Easy migration of data between versions (probably using South)
45+
* Integrated search engine (probably using Haystack)
46+
* User identification through OpenID
47+
* Recent advanced Web standards (PUSH, Websockets, etc)
48+
* Open data linking using standard ontologies (FOAF, SIOC, etc)
2049

2150
.. toctree::
2251
:maxdepth: 2

0 commit comments

Comments
 (0)