--- a/src/ldt/ldt/ldt_utils/forms.py Tue Jan 03 15:18:32 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/forms.py Tue Jan 03 16:26:26 2012 +0100
@@ -93,6 +93,7 @@
class GroupAddForm(ShareForm):
name = forms.CharField(required=True)
+ description = forms.CharField(widget=forms.Textarea, required=False)
class Meta:
model = Group
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Tue Jan 03 15:18:32 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Tue Jan 03 16:26:26 2012 +0100
@@ -8,6 +8,7 @@
{{ block.super }}
<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}/js/jquery.nyroModal.min.js"></script>
<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js" ></script>
+ <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/tiny_mce/tiny_mce.js"></script>
{{ content_form.media.js }}
{% endblock %}
@@ -17,36 +18,27 @@
<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/workspace.css" />
- <style type="text/css">
- #userslist, #selecteduserslist {
- width: 200px;
- height: 200px;
- margin: 5px;
- }
-
- #userslistcontainer, #selectors {
- float: left;
- }
-
- #memberslistcontainer {
- margin-top: 35px;
- }
-
- #selecteduserslistfooter, #userslistfooter {
- text-align: center;
- }
-
- #moveleftright {
- margin-top: 125px;
- margin-left: 10px;
- }
-
- </style>
+
{% endblock %}
{% block js_declaration %}
{{ block.super }}
<script type="text/javascript">
+
+ tinyMCE.init({
+ plugins : '-example',
+ mode : "textareas",
+ theme : "advanced",
+ language : "{{ LANGUAGE_CODE }}",
+ theme_advanced_buttons1 : "bold,italic,underline,separator,justifyleft,justifycenter,justifyfull,undo,redo,link,unlink",
+ theme_advanced_buttons2 : "",
+ theme_advanced_buttons3 : "",
+ theme_advanced_toolbar_location : "top",
+ theme_advanced_toolbar_align : "left",
+ width: "250",
+ height: "150",
+ entity_encoding : "raw"
+ });
$(document).ready(function() {
$("#close_button").click(function (e) {
@@ -93,6 +85,11 @@
{% for error in form.errors.name %}
<span class="error">{{ error }}</span>
{% endfor %}
+
+ <label for="description">{% trans "Description" %}</label>
+ <textarea id="description" name="description">
+ {{ img_container.description }}
+ </textarea>
</div>
{% include "ldt/ldt_utils/partial/permissions.html" %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Tue Jan 03 15:18:32 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Tue Jan 03 16:26:26 2012 +0100
@@ -48,7 +48,7 @@
<strong>{% trans "Current profile picture" %}</strong>
</td>
<td>
- {% thumbnail profile_image "x100" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %} {% endthumbnail %}
+ {% thumbnail img_container.image "x100" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %} {% endthumbnail %}
</td>
</tr>
<tr>
--- a/src/ldt/ldt/ldt_utils/views/content.py Tue Jan 03 15:18:32 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/content.py Tue Jan 03 16:26:26 2012 +0100
@@ -271,10 +271,10 @@
if iri_id:
create_content_action = reverse('ldt.ldt_utils.views.content.write_content', kwargs={'iri_id':iri_id})
- profile_image = content_form.instance.image
+ img_container = content_form.instance
else:
create_content_action = reverse('ldt.ldt_utils.views.content.write_content')
- profile_image = ''
+ img_container = ''
session_key = request.COOKIES[settings.SESSION_COOKIE_NAME]
cookie_name = settings.SESSION_COOKIE_NAME
@@ -282,7 +282,7 @@
return render_to_response('ldt/ldt_utils/create_content.html', {'content_form': content_form, 'media_form': media_form, 'form_status': form_status, 'create_content_action': create_content_action,
'elem_list': get_userlist(request.user), 'member_list': member_list, 'admin_list': admin_list, 'iri_id': iri_id, 'session_key':session_key,
- 'cookie_name':cookie_name, 'profile_image': profile_image}, context_instance=RequestContext(request))
+ 'cookie_name':cookie_name, 'img_container': img_container}, context_instance=RequestContext(request))
@login_required
def prepare_delete_content(request, iri_id=None):
--- a/src/ldt/ldt/ldt_utils/views/group.py Tue Jan 03 15:18:32 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/group.py Tue Jan 03 16:26:26 2012 +0100
@@ -43,13 +43,15 @@
form = GroupAddForm(request.POST)
picture_form = PictureForm(None, request.POST, request.FILES)
- if form.is_valid():
+ if form.is_valid():
name = form.cleaned_data['name']
members_list = form.cleaned_data['read_list']
admin_list = form.cleaned_data['write_list']
group = Group.objects.create(name=name)
group.save()
+ group.profile.description = form.cleaned_data['description']
+ group.profile.save()
picture_form.model = group
if picture_form.is_valid():
@@ -104,6 +106,8 @@
old_member_list = group.user_set.exclude(id=request.user.id)
admin_list = form.cleaned_data['write_list']
group.name = name
+ group.profile.description = form.cleaned_data['description']
+ group.profile.save()
for user in new_member_list:
if not hasattr(user, 'username'):
@@ -130,14 +134,14 @@
if form_status != 'deleted':
member_list, admin_list = get_userlist_group(group, request.user)
- profile_image = group.profile.image
+ profile_image = group.profile
else:
member_list = admin_list = []
profile_image = ''
return render_to_response("ldt/ldt_utils/create_group.html", {'group_id' : group_id, 'form' : form, 'form_status' : form_status, 'group_edition': True,
'elem_list' : get_userlist(request.user), 'member_list': member_list, 'admin_list': admin_list,
- 'is_owner_group': is_owner_group, 'profile_picture_form': picture_form, 'profile_image': profile_image}, context_instance=RequestContext(request))
+ 'is_owner_group': is_owner_group, 'profile_picture_form': picture_form, 'img_container': profile_image}, context_instance=RequestContext(request))
Binary file src/ldt/ldt/locale/en/LC_MESSAGES/django.mo has changed
Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js Tue Jan 03 15:18:32 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Tue Jan 03 16:26:26 2012 +0100
@@ -377,7 +377,7 @@
filters: ['iriIframe'],
sizes: {
minW: '750',
- minH: '510'
+ minH: '650'
},
showCloseButton: true,
closeOnEscape:false,
@@ -393,7 +393,7 @@
});
nm.store.iframe.width(740);
- nm.store.iframe.height(500);
+ nm.store.iframe.height(640);
},
afterClose: function(nm) {
searchCallback($("#searchprojectsinput"), $("#groupslistcontainer"), groupfilterurl, 0);
--- a/src/ldt/ldt/user/forms.py Tue Jan 03 15:18:32 2012 +0100
+++ b/src/ldt/ldt/user/forms.py Tue Jan 03 16:26:26 2012 +0100
@@ -120,7 +120,7 @@
class PictureForm(forms.Form):
- image = forms.ImageField(label=_("Profile picture"))
+ image = forms.ImageField(label=_("Profile picture"), required=False)
def __init__(self, model=None, *args, **kwargs):
self.model = model
@@ -128,6 +128,9 @@
def save(self):
+ if not self.cleaned_data['image']:
+ return None
+
class_name = self.model.__class__.__name__
if class_name == 'User':
instance_name = self.model.username
@@ -138,7 +141,7 @@
elif class_name == 'Content':
instance_name = self.model.title
img_container = self.model
-
+
# We change the file name and keep the extension.
filename = self.cleaned_data['image'].name
ext = filename.split(".")[-1]
@@ -146,6 +149,6 @@
# We save the picture with the correct name
img_container.image = self.cleaned_data['image']
img_container.save()
- return self.model
+ return self.model
\ No newline at end of file