CAMP/edgware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added stuff for user

Browse Source
This commit is contained in:
sanj 2010-03-23 01:34:38 +05:30
parent e78fda7297
commit 4777a090d0
3 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
edgware/editor/views.py
View File

@ -17,8 +17,9 @@ import os
@login_required @login_required
def editor(request): def editor(request):
user = request.user
c = Category.objects.all() c = Category.objects.all()
return render_to_response("editor.html", {'categories': c}) return render_to_response("editor.html", {'categories': c, 'user': user})
''' '''
def edit_page(request, id): def edit_page(request, id):
@ -80,7 +81,8 @@ def edit_article(request, id):
'article_id': id, 'article_id': id,
'article_width': a.view_size()[0], 'article_width': a.view_size()[0],
'article_height': a.view_size()[1], 'article_height': a.view_size()[1],
'rev_no': a.current_revision() 'rev_no': a.current_revision(),
'user': request.user
} }
return render_to_response("editor.html", rDict) return render_to_response("editor.html", rDict)

20
edgware/static/css/editor.css
View File

@ -94,6 +94,7 @@
float:right; float:right;
margin-left:5px; margin-left:5px;
} }
.handle_horiz_left { .handle_horiz_left {
left: -10px; left: -10px;
width: 10px; width: 10px;
@ -117,16 +118,13 @@
.handle_vert_top { .handle_vert_top {
margin-left: -8px; margin-left: -8px;
top: -10px; top: -10px;
height: 10px; height: 10px;
width: 16px; width: 16px;
} }
.handle_vert_bottom { .handle_vert_bottom {
margin-left: -8px; margin-left: -8px;
bottom: -10px; bottom: -10px;
height: 10px; height: 10px;
width: 16px; width: 16px;
@ -153,7 +151,6 @@
width: 300px; width: 300px;
height: 90%; height: 90%;
position:fixed; position:fixed;
} }
@ -177,6 +174,7 @@
color:white; color:white;
text-decoration:none; text-decoration:none;
} }
#addElements { #addElements {
background-color:lightgrey; background-color:lightgrey;
padding-left:40px; padding-left:40px;
@ -186,13 +184,13 @@
color:white; color:white;
border-style:solid; border-style:solid;
border-width:1px; border-width:1px;
} }
.resource { .resource {
float:left; float:left;
position: relative; position: relative;
} }
.resource img { .resource img {
border-style:solid; border-style:solid;
border-width:1px; border-width:1px;
@ -211,16 +209,19 @@
opacity: 0.8; opacity: 0.8;
padding: 0px; padding: 0px;
} }
.resourceMenu ul { .resourceMenu ul {
list-style: none; list-style: none;
padding: 0px; padding: 0px;
} }
.resourceMenu ul li { .resourceMenu ul li {
padding: 0px; padding: 0px;
list-style: none; list-style: none;
font-size: 11px; font-size: 11px;
cursor: pointer; cursor: pointer;
} }
.textbox_canvas_toolbox a { .textbox_canvas_toolbox a {
color:white; color:white;
text-decoration:none; text-decoration:none;
@ -229,23 +230,24 @@
.textbox_canvas { .textbox_canvas {
width:100%; width:100%;
height:100%; height:100%;
} }
.imagebox_canvas { .imagebox_canvas {
} }
.textbox_canvas_content { .textbox_canvas_content {
height:100%; height:100%;
} }
.textbox_canvas_content { .textbox_canvas_content {
margin-top:0px; margin-top:0px;
} }
.textbox_canvas_content * { .textbox_canvas_content * {
margin-top:0px; margin-top:0px;
} }
.textbox_canvas_text { .textbox_canvas_text {
margin-top:0px; margin-top:0px;
} }
@ -267,6 +269,7 @@ margin-top:0px;
z-index:999999; z-index:999999;
font-size:13px; font-size:13px;
} }
.imagebox_crop { .imagebox_crop {
position:absolute; position:absolute;
background-color:lightgrey; background-color:lightgrey;
@ -282,5 +285,4 @@ margin-top:0px;
.searchBin { .searchBin {
margin-top:5px; margin-top:5px;
} }

4
edgware/templates/editor.html
View File

@ -45,6 +45,7 @@
REVISION_NO = {{rev_no}}; REVISION_NO = {{rev_no}};
{% endif %} {% endif %}
var UUID = parseInt(new Date().getTime() / (10000 * (Math.random() * 10))); var UUID = parseInt(new Date().getTime() / (10000 * (Math.random() * 10)));
USER_ID = {{ user.id }};
isAjaxActive = false; isAjaxActive = false;
$(document).ready(function() { $(document).ready(function() {
edgeBin = new Bin(); edgeBin = new Bin();
@ -52,12 +53,11 @@
// var PAGE_ID = 1; // var PAGE_ID = 1;
var val = $(this).val(); var val = $(this).val();
edgeBin.loadCategory(val); edgeBin.loadCategory(val);
}); });
}); });
</script> </script>
<title> <title>
Edgware Editor Edgware Editor - {{ user.username }}
</title> </title>
</head> </head>
<body> <body>