Commit fd2db656 authored by Olga Brani's avatar Olga Brani
Browse files

Text changes

parent 536c1651
...@@ -604,16 +604,38 @@ class AstakosGroupCreationForm(forms.ModelForm): ...@@ -604,16 +604,38 @@ class AstakosGroupCreationForm(forms.ModelForm):
DOMAIN_VALUE_REGEX, DOMAIN_VALUE_REGEX,
_(astakos_messages.DOMAIN_VALUE_ERR), 'invalid' _(astakos_messages.DOMAIN_VALUE_ERR), 'invalid'
)], )],
widget=forms.TextInput(attrs={'placeholder': 'eg. foo.ece.ntua.gr'}), widget=forms.TextInput(attrs={'placeholder': 'myproject.mylab.ntua.gr'}),
help_text="Name should be in the form of dns" help_text=" The Project's name should be in a domain format. The domain shouldn't neccessarily exist in the real world but is helpful to imply a structure. e.g.: myproject.mylab.ntua.gr or myservice.myteam.myorganization "
)
homepage = forms.URLField(
label= 'Homepage Url',
widget=forms.TextInput(attrs={'placeholder': 'http://myproject.com'}),
help_text="This should be a URL pointing at your project's site. e.g.: http://myproject.com ",
required=False
)
desc = forms.CharField(
label= 'Description',
widget=forms.Textarea,
help_text= "Please provide a short but descriptive abstract of your Project, so that anyone searching can quickly understand what this Project is about. "
)
issue_date = forms.DateTimeField(
label= 'Start date',
help_text= "Here you specify the date you want your Project to start granting its resources. Its members will get the resources coming from this Project on this exact date."
)
expiration_date = forms.DateTimeField(
label= 'End date',
help_text= "Here you specify the date you want your Project to cease. This means that after this date all members will no longer be able to allocate resources from this Project. "
) )
moderation_enabled = forms.BooleanField( moderation_enabled = forms.BooleanField(
help_text="Check if you want to approve members participation manually", label= 'Moderated',
help_text="Select this to approve each member manually, before they become a part of your Project (default). Be sure you know what you are doing, if you uncheck this option. ",
required=False, required=False,
initial=True initial=True
) )
max_participants = forms.IntegerField( max_participants = forms.IntegerField(
required=True, min_value=1 label='Total number of members',
required=True, min_value=1,
help_text="Here you specify the number of members this Project is going to have. This means that this number of people will be granted the resources you will specify in the next step. This can be '1' if you are the only one wanting to get resources. "
) )
class Meta: class Meta:
......
...@@ -171,9 +171,9 @@ class AstakosGroup(Group): ...@@ -171,9 +171,9 @@ class AstakosGroup(Group):
'Creation date', 'Creation date',
default=datetime.now() default=datetime.now()
) )
issue_date = models.DateTimeField('Issue date', null=True) issue_date = models.DateTimeField('Start date', null=True)
expiration_date = models.DateTimeField( expiration_date = models.DateTimeField(
'Expiration date', 'End date',
null=True null=True
) )
moderation_enabled = models.BooleanField( moderation_enabled = models.BooleanField(
...@@ -1011,6 +1011,8 @@ def create_astakos_user(u): ...@@ -1011,6 +1011,8 @@ def create_astakos_user(u):
extended_user = AstakosUser(user_ptr_id=u.pk) extended_user = AstakosUser(user_ptr_id=u.pk)
extended_user.__dict__.update(u.__dict__) extended_user.__dict__.update(u.__dict__)
extended_user.save() extended_user.save()
if not extended_user.has_auth_provider('local'):
extended_user.add_auth_provider('local')
except BaseException, e: except BaseException, e:
logger.exception(e) logger.exception(e)
...@@ -1020,8 +1022,6 @@ def fix_superusers(sender, **kwargs): ...@@ -1020,8 +1022,6 @@ def fix_superusers(sender, **kwargs):
admins = User.objects.filter(is_superuser=True) admins = User.objects.filter(is_superuser=True)
for u in admins: for u in admins:
create_astakos_user(u) create_astakos_user(u)
if not u.has_auth_provider('local'):
u.add_auth_provider('local')
def user_post_save(sender, instance, created, **kwargs): def user_post_save(sender, instance, created, **kwargs):
......
...@@ -197,56 +197,68 @@ RESOURCES_PRESENTATION_DATA = getattr( ...@@ -197,56 +197,68 @@ RESOURCES_PRESENTATION_DATA = getattr(
settings, 'ASTAKOS_RESOURCES_PRESENTATION_DATA', { settings, 'ASTAKOS_RESOURCES_PRESENTATION_DATA', {
'groups': { 'groups': {
'compute': { 'compute': {
'help_text':'group compute help text', 'help_text':'Compute resources (amount of VMs, CPUs, RAM, System disk) ',
'is_abbreviation':False, 'is_abbreviation':False,
'report_desc':'', 'report_desc':'',
'verbose_name':'compute', 'verbose_name':'compute',
}, },
'storage': { 'storage': {
'help_text':'group storage help text', 'help_text':'Storage resources (amount of space to store files on Pithos) ',
'is_abbreviation':False, 'is_abbreviation':False,
'report_desc':'', 'report_desc':'',
'verbose_name':'storage', 'verbose_name':'storage',
}, },
'network': {
'help_text':' Network resources (amount of Private Networks) ',
'is_abbreviation':False,
'report_desc':'',
'verbose_name':'network',
},
}, },
'resources': { 'resources': {
'pithos+.diskspace': { 'pithos+.diskspace': {
'help_text':'resource pithos+.diskspace help text', 'help_text':'This is the space on Pithos for storing files and VM Images. ',
'help_text_input_each':'This is the total amount of space on Pithos that will be granted to each user of this Project ',
'is_abbreviation':False, 'is_abbreviation':False,
'report_desc':'Pithos+ Diskspace', 'report_desc':'Pithos+ Diskspace',
'placeholder':'eg. 10GB', 'placeholder':'eg. 10GB',
'verbose_name':'diskspace', 'verbose_name':'Storage Space',
}, },
'cyclades.vm': { 'cyclades.vm': {
'help_text':'resource cyclades.vm help text resource cyclades.vm help text resource cyclades.vm help text resource cyclades.vm help text', 'help_text':'These are the VMs one can create on the Cyclades UI ',
'help_text_input_each':'This is the total number of VMs that will be granted to each user of this Project ',
'is_abbreviation':True, 'is_abbreviation':True,
'report_desc':'Virtual Machines', 'report_desc':'Virtual Machines',
'placeholder':'eg. 2', 'placeholder':'eg. 2',
'verbose_name':'vm', 'verbose_name':'vm',
}, },
'cyclades.disk': { 'cyclades.disk': {
'help_text':'resource cyclades.disk help text', 'help_text':'This is the System Disk that the VMs have that run the OS ',
'help_text_input_each':"This is the total amount of System Disk that will be granted to each user of this Project (this refers to the total System Disk of all VMs, not each VM's System Disk) ",
'is_abbreviation':False, 'is_abbreviation':False,
'report_desc':'Disk', 'report_desc':'Disk',
'placeholder':'eg. 5GB, 2GB etc', 'placeholder':'eg. 5GB, 2GB etc',
'verbose_name':'disk' 'verbose_name':'System Disk'
}, },
'cyclades.ram': { 'cyclades.ram': {
'help_text':'resource cyclades.ram help text', 'help_text':'RAM used by VMs ',
'help_text_input_each':'This is the total amount of RAM that will be granted to each user of this Project (on all VMs) ',
'is_abbreviation':True, 'is_abbreviation':True,
'report_desc':'RAM', 'report_desc':'RAM',
'placeholder':'eg. 4GB', 'placeholder':'eg. 4GB',
'verbose_name':'ram' 'verbose_name':'ram'
}, },
'cyclades.cpu': { 'cyclades.cpu': {
'help_text':'resource cyclades.cpu help text', 'help_text':'CPUs used by VMs ',
'help_text_input_each':'This is the total number of CPUs that will be granted to each user of this Project (on all VMs) ',
'is_abbreviation':True, 'is_abbreviation':True,
'report_desc':'CPUs', 'report_desc':'CPUs',
'placeholder':'eg. 1', 'placeholder':'eg. 1',
'verbose_name':'cpu' 'verbose_name':'cpu'
}, },
'cyclades.network.private': { 'cyclades.network.private': {
'help_text':'resource cyclades.network.private help text', 'help_text':'These are the Private Networks one can create on the Cyclades UI. ',
'help_text_input_each':'This is the total number of Private Networks that will be granted to each user of this Project ',
'is_abbreviation':False, 'is_abbreviation':False,
'report_desc':'Network', 'report_desc':'Network',
'placeholder':'eg. 1', 'placeholder':'eg. 1',
......
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
<em> <em>
{% if object.is_owner %} {% if object.is_owner %}
{% if object.is_enabled %} {% if object.is_enabled %}
[ ADMINISTRATOR - ACTIVE ] [ ADMINISTRATOR ]
{% else %} {% else %}
[ ADMINISTRATOR - PENDING ] [ ADMINISTRATOR ] - ACTIVATION PENDING
{% endif %} {% endif %}
{% else %} {% else %}
{% if object.is_active_member %} {% if object.is_active_member %}
[ ENROLLED - ACTIVE ] [ ENROLLED ]
{% else %} {% else %}
[ ENROLLED - PENDING ] [ ACTIVATION PENDING ]
{% endif %} {% endif %}
{% endif %} {% endif %}
</em> </em>
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
<fieldset class="with-info" id="top"> <fieldset class="with-info" id="top">
<legend> <legend>
1. CREATE GROUP 1. CREATE PROJECT
<span class="info"> <span class="info">
<em>more info</em> <em>more info</em>
<span>Fill in the required fields to create a group. Group details will be visible to the users of the group.</span> <span> To create a new Project, first enter the following required fields.<br> The information you enter will be visible to all ~okeanos users. </span>
</span> </span>
</legend> </legend>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
2. ADD RESOURCES 2. ADD RESOURCES
<span class="info"> <span class="info">
<em>more info</em> <em>more info</em>
<span>You need to specify at least one resource</span> <span> Here you add resources to your Project. Each resource you specify here, will be granted to *EACH* user of this Project. So the total resources will be: &lt;Total number of members&gt; * &lt;amount_of_resource&gt; for each resource. </span>
</span> </span>
</legend> </legend>
<ul class="clearfix"> <ul class="clearfix">
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
{% endif %} {% endif %}
/> />
<span class="extra-img">&nbsp;</span> <span class="extra-img">&nbsp;</span>
<span class="info"><em>more info</em><span>Leave this field blank if you don't want to specify this resource</span></span> <span class="info"><em>more info</em><span>{{ rdata.help_text_input_each }}</span></span>
<p class="error-msg">Invalid format</p> <p class="error-msg">Invalid format</p>
</p> </p>
<p class="msg"></p> <p class="msg"></p>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment