From d4fe0e1327354f57f87fa317555e58827bcea851 2016-04-06 21:55:54
From: Juan C. Espinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2016-04-06 21:55:54
Subject: [PATCH] Update several views and models in main app

git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@106 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71

---

diff --git a/apache/apache_radarsys.conf b/apache/apache_radarsys.conf
index 0ba60e5..a0928fc 100644
--- a/apache/apache_radarsys.conf
+++ b/apache/apache_radarsys.conf
@@ -3,10 +3,7 @@
 WSGIScriptAlias / /usr/local/radarsys/radarsys/wsgi.py
 WSGIPythonPath /usr/local/radarsys/:/usr/local/virtuals/radarsys/lib/python2.7/site-packages
 
-Alias /static/ /usr/local/radarsys/apps/main/static/
-<Directory /usr/local/radarsys/apps/main/static>
-    Require all granted
-</Directory>
+Alias /static/ /var/www/html/static/
 
 <Directory /usr/local/radarsys/>
   <Files wsgi.py>
@@ -14,6 +11,4 @@ Alias /static/ /usr/local/radarsys/apps/main/static/
     Require all granted
     #Allow from all
   </Files>
-</Directory>
-
-
+</Directory>
\ No newline at end of file
diff --git a/apps/cgs/forms.py b/apps/cgs/forms.py
index 254745f..8385de0 100644
--- a/apps/cgs/forms.py
+++ b/apps/cgs/forms.py
@@ -3,7 +3,7 @@ from apps.main.models import Device
 from .models import CGSConfiguration
 
 class CGSConfigurationForm(forms.ModelForm):
-    #freq0.widget = te 
+    
     def __init__(self, *args, **kwargs):
         #request = kwargs.pop('request')
         super(CGSConfigurationForm, self).__init__(*args, **kwargs)
@@ -13,10 +13,11 @@ class CGSConfigurationForm(forms.ModelForm):
         if instance and instance.pk:
             
             devices = Device.objects.filter(device_type__name='cgs')
-            items = devices.values('id', 'name', 'device_type__name', 'ip_address')
             
-            self.fields['experiment'].widget.attrs['readonly'] = True
-            self.fields['device'].widget.choices = [(item['id'], '[%s]: %s | %s' % (item['device_type__name'], item['name'], item['ip_address'])) for item in items]
+            if instance.experiment:
+                self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
+                
+            self.fields['device'].widget.choices = [(device.id, device) for device in devices]
     
     def clean(self):
         return
@@ -24,9 +25,8 @@ class CGSConfigurationForm(forms.ModelForm):
 
     class Meta:
         model = CGSConfiguration
-        #exclude = ('freqs', 'clk_in', 'mult','div',)
-#         exclude = ('freqs',)
-        fields = ('experiment', 'device', 'freq0', 'freq1', 'freq2', 'freq3')
+        exclude = ('type', 'parameters', 'status')
+        #fields = ('experiment', 'device', 'freq0', 'freq1', 'freq2', 'freq3')
         
         
 class UploadFileForm(forms.Form):
diff --git a/apps/cgs/models.py b/apps/cgs/models.py
index 04765cb..3ec678f 100644
--- a/apps/cgs/models.py
+++ b/apps/cgs/models.py
@@ -15,8 +15,6 @@ class CGSConfiguration(Configuration):
     freq1 = models.IntegerField(verbose_name='Frequency 1',validators=[MinValueValidator(0), MaxValueValidator(450e6)], blank=True, null=True)
     freq2 = models.IntegerField(verbose_name='Frequency 2',validators=[MinValueValidator(0), MaxValueValidator(450e6)], blank=True, null=True)
     freq3 = models.IntegerField(verbose_name='Frequency 3',validators=[MinValueValidator(0), MaxValueValidator(450e6)], blank=True, null=True)
-    #jfreqs = JSONField(default={"frequencies":[{"f0":freq0,"f1":freq1,"f2":freq2,"f3":freq3}]}, blank=True)
-    
     
     def verify_frequencies(self):
         
diff --git a/apps/cgs/views.py b/apps/cgs/views.py
index e3e799e..c38d214 100644
--- a/apps/cgs/views.py
+++ b/apps/cgs/views.py
@@ -66,7 +66,7 @@ def cgs_conf(request, id_conf):
     kwargs['no_play'] = True
     
     ###### SIDEBAR ######
-    kwargs.update(sidebar(conf))
+    kwargs.update(sidebar(conf=conf))
     
     return render(request, 'cgs_conf.html', kwargs)
 
@@ -101,10 +101,6 @@ def cgs_conf_edit(request, id_conf):
     kwargs['suptitle'] = 'Edit'
     kwargs['button'] = 'Save'
     
-    
-    ###### SIDEBAR ######
-    kwargs.update(sidebar(conf))
-    
     return render(request, 'cgs_conf_edit.html', kwargs)
 # 
 # def cgs_conf_write(request, id_conf):
diff --git a/apps/dds/forms.py b/apps/dds/forms.py
index 26a4b91..28c4395 100644
--- a/apps/dds/forms.py
+++ b/apps/dds/forms.py
@@ -16,10 +16,8 @@ class DDSConfigurationForm(forms.ModelForm):
             
             devices = Device.objects.filter(device_type__name='dds')
             
-            self.fields['experiment'].widget.attrs['readonly'] = True
-            
-            if instance.experiment is not None:
-                self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
+            if instance.experiment:
+                self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
             
             self.fields['device'].widget.choices = [(device.id, device) for device in devices]
     
diff --git a/apps/dds/views.py b/apps/dds/views.py
index 8cb7d4b..9c5fd45 100644
--- a/apps/dds/views.py
+++ b/apps/dds/views.py
@@ -42,7 +42,7 @@ def dds_conf(request, id_conf):
     kwargs['button'] = 'Edit Configuration'
     
     ###### SIDEBAR ######
-    kwargs.update(sidebar(conf))
+    kwargs.update(sidebar(conf=conf))
     
     return render(request, 'dds_conf.html', kwargs)
     
@@ -73,9 +73,6 @@ def dds_conf_edit(request, id_conf):
     kwargs['suptitle'] = 'Edit'
     kwargs['button'] = 'Save'
     
-    ###### SIDEBAR ######
-    kwargs.update(sidebar(conf))
-    
     return render(request, 'dds_conf_edit.html', kwargs)
 
 # def dds_conf_import(request, id_conf):
diff --git a/apps/main/fixtures/main_initial_data.json b/apps/main/fixtures/main_initial_data.json
index 64cc4be..3cebba3 100644
--- a/apps/main/fixtures/main_initial_data.json
+++ b/apps/main/fixtures/main_initial_data.json
@@ -1,7 +1,8 @@
 [
-{"fields": {"name": "JRO", "description": ""}, "model": "main.location", "pk": 1}, 
-{"fields": {"name": "JASMET", "description": ""}, "model": "main.location", "pk": 2}, 
-{"fields": {"name": "SOUSY", "description": ""}, "model": "main.location", "pk": 3}, 
+{"fields": {"name": "MAIN RADAR", "description": ""}, "model": "main.location", "pk": 1}, 
+{"fields": {"name": "JASMET", "description": ""}, "model": "main.location", "pk": 2},
+{"fields": {"name": "SOUSY", "description": ""}, "model": "main.location", "pk": 3},
+{"fields": {"name": "JULIA", "description": ""}, "model": "main.location", "pk": 4},
 {"fields": {"name": "rc", "description": ""}, "model": "main.devicetype", "pk": 1}, 
 {"fields": {"name": "dds", "description": ""}, "model": "main.devicetype", "pk": 2}, 
 {"fields": {"name": "cgs", "description": ""}, "model": "main.devicetype", "pk": 3}, 
diff --git a/apps/main/forms.py b/apps/main/forms.py
index afda942..42446bc 100644
--- a/apps/main/forms.py
+++ b/apps/main/forms.py
@@ -39,10 +39,16 @@ class TimepickerWidget(forms.widgets.TextInput):
         return mark_safe(html)
 
 class CampaignForm(forms.ModelForm):
+    
+    experiments = forms.ModelMultipleChoiceField(widget=forms.CheckboxSelectMultiple(),
+                                                 queryset=Experiment.objects.filter(template=True),
+                                                 required=False)
+    
     def __init__(self, *args, **kwargs):
         super(CampaignForm, self).__init__(*args, **kwargs)
         self.fields['start_date'].widget = DatepickerWidget(self.fields['start_date'].widget.attrs)
         self.fields['end_date'].widget = DatepickerWidget(self.fields['end_date'].widget.attrs)
+        self.fields['description'].widget.attrs = {'rows': 2}
     
     class Meta:
         model = Campaign
@@ -54,8 +60,6 @@ class ExperimentForm(forms.ModelForm):
         super(ExperimentForm, self).__init__(*args, **kwargs)
         self.fields['start_time'].widget = TimepickerWidget(self.fields['start_time'].widget.attrs)
         self.fields['end_time'].widget = TimepickerWidget(self.fields['end_time'].widget.attrs)
-    
-        self.fields['campaign'].widget.attrs['readonly'] = True
         
     class Meta:
         model = Experiment
@@ -72,6 +76,13 @@ class DeviceForm(forms.ModelForm):
         exclude = ['status']
 
 class ConfigurationForm(forms.ModelForm):
+    
+    def __init__(self, *args, **kwargs):
+        super(ConfigurationForm, self).__init__(*args, **kwargs)
+        
+        if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
+            self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
+    
     class Meta:
         model = Configuration
         exclude = ['type', 'created_date', 'programmed_date', 'parameters']
@@ -124,4 +135,17 @@ class OperationSearchForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super(OperationSearchForm, self).__init__(*args, **kwargs)
         self.fields['campaign'].choices=Campaign.objects.all().order_by('-start_date').values_list('id', 'name')
+        
+class NewForm(forms.Form):
+    
+    create_from = forms.ChoiceField(choices=((0, '-----'),
+                                             (1, 'Empty (blank)'),
+                                             (2, 'Template')))
+    choose_template = forms.ChoiceField()
+    
+    def __init__(self, *args, **kwargs):
+        
+        template_choices = kwargs.pop('template_choices', [])
+        super(NewForm, self).__init__(*args, **kwargs)
+        self.fields['choose_template'].choices = add_empty_choice(template_choices)
     
\ No newline at end of file
diff --git a/apps/main/models.py b/apps/main/models.py
index 94b01a0..fe7d81e 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -1,3 +1,6 @@
+
+from datetime import datetime
+
 from django.db import models
 from polymorphic import PolymorphicModel
 
@@ -103,35 +106,22 @@ class Device(models.Model):
 
 class Campaign(models.Model):
 
-    template = models.BooleanField(default=False)
-    
-    name = models.CharField(max_length=40, unique=True)
-    experiment = models.ManyToManyField('Experiment')
-
+    template = models.BooleanField(default=False)    
+    name = models.CharField(max_length=60, unique=True)
     start_date = models.DateTimeField(blank=True, null=True)
     end_date = models.DateTimeField(blank=True, null=True)
     tags = models.CharField(max_length=40)
     description = models.TextField(blank=True, null=True)
+    experiments = models.ManyToManyField('Experiment', blank=True)
 
     class Meta:
         db_table = 'db_campaigns'
+        ordering = ('name',)
     
     def __unicode__(self):
         return u'%s' % (self.name)
-    
-# class Radar(models.Model):
-# 
-# #     name = models.CharField(max_length = 30)
-#     experiment = models.ForeignKey('Experiment', on_delete=models.CASCADE)
-#     location = models.OneToOneField('Location', on_delete=models.CASCADE)
-#     status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES)
-# 
-#     class Meta:
-#         db_table = 'db_radar'
-#     
-#     def __unicode__(self):
-#         return u'%s' % self.location
 
+    
 class RunningExperiment(models.Model):
     radar = models.OneToOneField('Location', on_delete=models.CASCADE)
     running_experiment = models.ManyToManyField('Experiment')
@@ -140,22 +130,35 @@ class RunningExperiment(models.Model):
     
 class Experiment(models.Model):
 
-    template = models.BooleanField(default=False)
-    
-    #campaign = models.ForeignKey('Campaign', null=True, blank=True, on_delete=models.CASCADE)
+    template = models.BooleanField(default=False)    
+    location = models.ForeignKey('Location', null=True, blank=True, on_delete=models.CASCADE)    
+    name = models.CharField(max_length=40, default='', unique=True)
     location = models.ForeignKey('Location', null=True, blank=True, on_delete=models.CASCADE)
-    
-    name = models.CharField(max_length=40, default='')
     start_time = models.TimeField(default='00:00:00')
     end_time = models.TimeField(default='23:59:59')
     status = models.PositiveSmallIntegerField(default=0, choices=EXP_STATES)
 
     class Meta:
         db_table = 'db_experiments'
+        ordering = ('name',)
     
     def __unicode__(self):
         return u'%s' % (self.name)
     
+    def clone(self, **kwargs):
+        
+        confs = Configuration.objects.filter(experiment=self, type=0)
+        self.pk = None
+        self.name = '{} [{:%Y/%m/%d}]'.format(self.name, datetime.now())
+        for attr, value in kwargs.items():
+            setattr(self, attr, value)
+        
+        self.save()
+        
+        for conf in confs:
+            conf.clone(experiment=self, template=False)
+        
+        return self 
     
     def get_status(self):
         configurations =  Configuration.objects.filter(experiment=self)
@@ -198,6 +201,7 @@ class Experiment(models.Model):
         
         return color
     
+    
 class Configuration(PolymorphicModel):
 
     template = models.BooleanField(default=False)
@@ -228,7 +232,16 @@ class Configuration(PolymorphicModel):
         else:
             return u'%s' % self.device.name
 
+    def clone(self, **kwargs):
         
+        self.pk = None
+        self.id = None
+        for attr, value in kwargs.items():
+            setattr(self, attr, value)
+        
+        self.save()    
+
+        return self
     
     def parms_to_dict(self):
         
diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 1ccdf7e..2047838 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -13,7 +13,11 @@
       body {padding-top: 60px}
       .logo {padding-top: 5px; height: 50px}
       .clickable-row {cursor: pointer;}
-      .col-no-padding { padding-left:0; }
+      .col-no-padding { padding-left:0;}
+      .gi-2x{font-size: 2em;}
+      .gi-3x{font-size: 3em;}
+      .gi-4x{font-size: 4em;}
+      .gi-5x{font-size: 5em;}
     </style>
     <!--[if lt IE 9]>
 	<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -41,29 +45,22 @@
         <ul class="nav navbar-nav"> 
           <li class=" dropdown {% block operation-active %}{% endblock %}"><a href="{% url 'url_operation'%}">Operation</a>
           </li>
-          <li class=" dropdown {% block conf-active %}{% endblock %}">
+          <li class=" dropdown {% block new-active %}{% endblock %}">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">New<span class="caret"></span></a>          
             <ul class="dropdown-menu" role="menu">
               <li><a href="{% url 'url_add_campaign' %}">Campaign</a></li>
-              <li><a href="{% url 'url_add_experiment' 0%}">Experiment</a></li>
+              <li><a href="{% url 'url_add_experiment' %}">Experiment</a></li>
               <li><a href="{% url 'url_add_dev_conf' 0%}">Device Configuration</a></li>
-              <li><a href="{% url 'url_add_device'%}">Radar/Device</a></li>
-              
+              <li><a href="{% url 'url_add_device'%}">Device</a></li>
             </ul>          
           </li>
-          <li class=" dropdown {% block test-active %}{% endblock %}">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Test<span class="caret"></span></a>          
-            <ul class="dropdown-menu" role="menu">
-              <li><a href="{% url 'url_experiments' %}">Experiments</a></li>              
-              <li><a href="{% url 'url_devices' %}">Devices</a></li>
-            </ul>
-          </li>
           <li class=" dropdown {% block search-active %}{% endblock %}">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Search<span class="caret"></span></a>          
             <ul class="dropdown-menu" role="menu">
               <li><a href="{% url 'url_campaigns' %}">Campaigns</a></li>              
               <li><a href="{% url 'url_experiments' %}">Experiments</a></li>
               <li><a href="{% url 'url_dev_confs' %}">Configurations</a></li>
+              <li><a href="{% url 'url_devices' %}">Devices</a></li>
             </ul>
           </li>          
         </ul>
diff --git a/apps/main/templates/campaign.html b/apps/main/templates/campaign.html
index 41490ad..56bc435 100644
--- a/apps/main/templates/campaign.html
+++ b/apps/main/templates/campaign.html
@@ -52,8 +52,7 @@
 			  {% endfor %}
 			</tr>
 			{% endfor %}
-		  </table>  
-		  <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
+		  </table>		  
 	      </div>
 	    </div>
 	  </div>
@@ -72,12 +71,8 @@
 	  });
   
   $("#bt_edit").click(function() {
-	    document.location = "{% url 'url_edit_campaign' campaign.id%}";
+	    document.location = "{% url 'url_edit_campaign' campaign.id %}";
 	  });
   
-  $("#bt_add").click(function() {
-    document.location = "{% url 'url_add_experiment' campaign.id%}";
-  });
-  
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/campaign_edit.html b/apps/main/templates/campaign_edit.html
index e9376ab..6252d7c 100644
--- a/apps/main/templates/campaign_edit.html
+++ b/apps/main/templates/campaign_edit.html
@@ -16,8 +16,10 @@
   {% csrf_token %}
   {% bootstrap_form form layout='horizontal' size='medium' %}
   <div style="clear: both;"></div>
-  <br>
-  <button type="submit" class="btn btn-primary pull-right">{{button}}</button>
+  {% if button %}
+    <br>
+    <button type="submit" class="btn btn-primary pull-right">{{button}}</button>
+  {% endif %}
 </form>
 {% endblock %}
 
@@ -32,5 +34,21 @@
 
   $('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
   
+  $('#id_create_from').change(function() {
+    var url = "{% url 'url_add_campaign' %}";
+    if ($(this).val()=="2"){      
+      document.location = url+"?template=0";
+    }else if ($(this).val()=="1"){
+      document.location = url+"?blank=0";
+    }else{
+      document.location = url;
+    }
+  });
+  
+  $('#id_choose_template').change(function() {
+    var url = "{% url 'url_add_campaign' %}";          
+    document.location = url+"?template="+$(this).val();    
+  });
+  
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/campaigns.html b/apps/main/templates/campaigns.html
index 8d80f6b..d3f8c25 100644
--- a/apps/main/templates/campaigns.html
+++ b/apps/main/templates/campaigns.html
@@ -28,7 +28,7 @@
 	</tr>
   {% endfor %}
 </table>
-<button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
+
 {% endblock %}
 
 {% block sidebar%}
@@ -37,14 +37,10 @@
 
 {% block extra-js%}
 <script type="text/javascript">
-  
-  $("#bt_add").click(function() {
-    document.location = "{% url 'url_add_campaign' %}";
-  });
  
   $(".clickable-row").click(function() {
 	    document.location = $(this).data("href");
-	  });
+  });
   
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/dev_conf.html b/apps/main/templates/dev_conf.html
index c48328d..a95411c 100644
--- a/apps/main/templates/dev_conf.html
+++ b/apps/main/templates/dev_conf.html
@@ -3,7 +3,7 @@
 {% load static %}
 {% load main_tags %}
 
-{% block conf-active %}active{% endblock %}
+{% block search-active %}active{% endblock %}
 
 {% block content-title %}{{title}}{% endblock %}
 {% block content-suptitle %}{{suptitle}}{% endblock %}
@@ -12,7 +12,7 @@
 
 {% block menu-actions %}
 <span class=" dropdown pull-right">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span></a>          
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-menu-hamburger gi-2x" aria-hidden="true"></span></a>
   <ul class="dropdown-menu" role="menu">
     <li><a href="{{ dev_conf.get_absolute_url_edit }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit</a></li>
     <li><a href="{{ dev_conf.get_absolute_url_import }}"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Import </a></li>
diff --git a/apps/main/templates/dev_conf_edit.html b/apps/main/templates/dev_conf_edit.html
index 79f1283..fdba05c 100644
--- a/apps/main/templates/dev_conf_edit.html
+++ b/apps/main/templates/dev_conf_edit.html
@@ -37,10 +37,12 @@
 {% endblock %}
 
 {% block extra-js%}
+{% if id_exp %}
 <script type="text/javascript">
   $("#id_device").change(function() {
     var url = "{% url 'url_add_dev_conf' id_exp  %}";
     document.location = url+ $(this).val() + "/";
   });
- </script>
+</script>
+{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/dev_confs.html b/apps/main/templates/dev_confs.html
index fff7773..e732cd2 100644
--- a/apps/main/templates/dev_confs.html
+++ b/apps/main/templates/dev_confs.html
@@ -28,7 +28,6 @@
 	</tr>
   {% endfor %}
 </table>
-<button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
 {% endblock %}
 
 {% block sidebar%}
@@ -37,14 +36,10 @@
 
 {% block extra-js%}
 <script type="text/javascript">
-
-  $("#bt_add").click(function() {
-    document.location = "{% url 'url_add_dev_conf' 0%}";
-  });
  
   $(".clickable-row").click(function() {
 	    document.location = $(this).data("href");
-	  });
+  });
   
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/devices.html b/apps/main/templates/devices.html
index 22b4244..6f9a577 100644
--- a/apps/main/templates/devices.html
+++ b/apps/main/templates/devices.html
@@ -25,7 +25,7 @@
 	</tr>
   {% endfor %}
 </table>
-<button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
+
 {% endblock %}
 
 {% block sidebar%}
@@ -34,14 +34,10 @@
 
 {% block extra-js%}
 <script type="text/javascript">
-  
-  $("#bt_add").click(function() {
-    document.location = "{% url 'url_add_device' %}";
-  });
  
   $(".clickable-row").click(function() {
 	    document.location = $(this).data("href");
-	  });
+  });
   
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/experiment.html b/apps/main/templates/experiment.html
index 57aa1a6..fc2c166 100644
--- a/apps/main/templates/experiment.html
+++ b/apps/main/templates/experiment.html
@@ -73,7 +73,7 @@
 	  });
   
   $("#bt_add_conf").click(function() {
-    document.location = "{% url 'url_add_dev_conf' experiment.id%}";
+    document.location = "{% url 'url_add_dev_conf' experiment.id %}";
   });
   
 </script>
diff --git a/apps/main/templates/experiment_edit.html b/apps/main/templates/experiment_edit.html
index 90e8291..b9822c6 100644
--- a/apps/main/templates/experiment_edit.html
+++ b/apps/main/templates/experiment_edit.html
@@ -17,7 +17,44 @@
   {% bootstrap_form form layout='horizontal' size='medium' %}
   <div style="clear: both;"></div>
   <br>
-  <button type="submit" class="btn btn-primary pull-right">{{button}}</button>
+  {% if configurations %}
+      <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">   
+      <div class="panel panel-default">
+        <div class="panel-heading" role="tab" id="headingTwo">
+          <h4 class="panel-title">
+            <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseThree">
+              Device Configurations
+            </a>
+          </h4>
+        </div>
+        <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
+          <div class="panel-body">
+          <table class="table table-hover">
+            <tr>
+              <th>#</th>
+              {% for key in configuration_keys %}
+              <th>{{ key|title }}</th>                     
+              {% endfor%}
+            </tr>
+            {% for item in configurations %}
+            <tr class="clickable-row" data-href="{{item.get_absolute_url}}">
+              <td>{{ forloop.counter }}</td>
+              {% for key in configuration_keys %}
+              <td>{{ item|value:key }}</td>              
+              {% endfor %}
+            </tr>
+            {% endfor %}
+          </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  {% endif %}
+  
+  {% if button %}
+    <br>
+    <button type="submit" class="btn btn-primary pull-right">{{button}}</button>
+  {% endif %}
 </form>
 {% endblock %}
 
@@ -29,10 +66,28 @@
 <script src="{% static 'js/moment.min.js' %}"></script>
 <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
+  
   $('.input-group.time').datetimepicker({
     format: 'HH:mm:ss',
     pickDate: false,
     pickSeconds: true
   });
+  
+  $('#id_create_from').change(function() {
+    var url = "{% url 'url_add_experiment' %}";
+    if ($(this).val()=="2"){      
+      document.location = url+"?template=0";
+    }else if ($(this).val()=="1"){
+      document.location = url+"?blank=0";
+    }else{
+      document.location = url;
+    }
+  });
+  
+  $('#id_choose_template').change(function() {
+    var url = "{% url 'url_add_experiment' %}";          
+    document.location = url+"?template="+$(this).val();    
+  });
+  
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/experiments.html b/apps/main/templates/experiments.html
index 7aabec7..6c9cce1 100644
--- a/apps/main/templates/experiments.html
+++ b/apps/main/templates/experiments.html
@@ -28,7 +28,6 @@
 	</tr>
   {% endfor %}
 </table>
-<button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
 {% endblock %}
 
 {% block sidebar%}
@@ -42,9 +41,5 @@
     document.location = $(this).data("href");
   });
   
-  $("#bt_add").click(function() {
-    document.location = "{% url 'url_add_experiment' 0 %}";
-  });
-  
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/main/templates/sidebar_devices.html b/apps/main/templates/sidebar_devices.html
index 9975d95..793d80a 100644
--- a/apps/main/templates/sidebar_devices.html
+++ b/apps/main/templates/sidebar_devices.html
@@ -1,66 +1,3 @@
-{% if campaign %}
-	<div class="panel panel-default">
-	  <div class="panel-heading">
-	    <h4>Campaign</h4>
-	  </div>
-	  <div class="list-group"> 
-	  	<a href="{% url 'url_campaign' campaign.id %}" class="list-group-item active" >{{ campaign.name }}</a>
-	  </div>
-	</div>
-	
-	{% if experiments %}
-		<div class="panel panel-default">
-		  <div class="panel-heading">
-		    <h4>Experiments</h4>
-		  </div>
-		  <div class="list-group"> 
-		  {% for item in experiments %}
-		    <a href="{% url 'url_experiment' item.id %}" class="list-group-item {{item.active}}">{{item.name}}</a>      
-		  {% endfor %}
-		  </div>
-		</div>
-	{% endif %}
-{% endif %}
-
-{% if experiment %}
-	<div class="panel panel-default">
-	  <div class="panel-heading">
-	    <h4>Campaign</h4>
-	  </div>
-	  <div class="list-group"> 
-	  	<a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a>
-	  </div>
-	</div>
-	
-	{% if experiments %}
-		<div class="panel panel-default">
-		  <div class="panel-heading">
-		    <h4>Experiments</h4>
-		  </div>
-		  <div class="list-group"> 
-		  {% for item in experiments %}
-		    <a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == experiment.id%}active{%endif%}">{{item.name}}</a>      
-		  {% endfor %}
-		  </div>
-		</div>
-	{% endif %}
-	
-	{% if configurations %}
-		<div class="panel panel-default">
-		  <div class="panel-heading">
-		    <h4>Device Configurations</h4>
-		  </div>
-		  <div class="list-group"> 
-		  {% for item in configurations %}
-		    <a href="{{item.get_absolute_url}}" class="list-group-item {{item.active}}">{{item.device.name}}</a>      
-		  {% endfor %}
-		  </div>
-		</div>
-	{% endif %}
-	
-{% endif %}
-
-{% if dev_conf %}
 	
 	{% if campaign %}
     	<div class="panel panel-default">
@@ -68,36 +5,33 @@
     	    <h4>Campaign</h4>
     	  </div>
     	  <div class="list-group"> 
-    	  	<a href="{% url 'url_campaign' dev_conf.experiment.campaign.id %}" class="list-group-item active" >{{ dev_conf.experiment.campaign.name }}</a>
+    	  	<a href="{% url 'url_campaign' campaign.id %}" class="list-group-item active" >{{ campaign.name }}</a>
     	  </div>
     	</div>
 	{% endif %}
 	
-	{% if experiments %}
+	{% if experiment %}
 		<div class="panel panel-default">
 		  <div class="panel-heading">
 		    <h4>Experiments</h4>
 		  </div>
 		  <div class="list-group"> 
-		  {% for item in experiments %}
-		    <a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == dev_conf.experiment.id%}active{%endif%}">{{item.name}}</a>      
+		  {% for item in side_experiments %}
+		    <a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == experiment.id%}active{%endif%}">{{item.name}}</a>      
 		  {% endfor %}
 		  </div>
 		</div>
 	{% endif %}
 	
-	{% if configurations %}
+	{% if dev_conf %}
 		<div class="panel panel-default">
 		  <div class="panel-heading">
 		    <h4>Device Configurations</h4>
 		  </div>
 		  <div class="list-group"> 
-		  {% for item in configurations %}
+		  {% for item in side_configurations %}
 		    <a href="{{item.get_absolute_url}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item.device.name}}</a>      
 		  {% endfor %}
 		  </div>
 		</div>
 	{% endif %}
-	
-	
-{% endif %}
diff --git a/apps/main/templatetags/main_tags.py b/apps/main/templatetags/main_tags.py
index 43f5d6d..b4ae7c6 100644
--- a/apps/main/templatetags/main_tags.py
+++ b/apps/main/templatetags/main_tags.py
@@ -25,7 +25,6 @@ def value(instance, key):
     for my_key in key.split("__"):
         item = attr(item, my_key)
     
-    print item
     return item
 
 @register.simple_tag
diff --git a/apps/main/urls.py b/apps/main/urls.py
index 3ddac64..971bb49 100644
--- a/apps/main/urls.py
+++ b/apps/main/urls.py
@@ -19,7 +19,7 @@ urlpatterns = (
     url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', 'apps.main.views.campaign_edit', name='url_edit_campaign'),
     url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.campaign_delete', name='url_delete_campaign'),
     
-    url(r'^campaign/(?P<id_camp>-?\d+)/new_experiment/$', 'apps.main.views.experiment_new', name='url_add_experiment'),
+    url(r'^experiment/new/$', 'apps.main.views.experiment_new', name='url_add_experiment'),
     url(r'^experiment/$', 'apps.main.views.experiments', name='url_experiments'),
     url(r'^experiment/(?P<id_exp>-?\d+)/$', 'apps.main.views.experiment', name='url_experiment'),
     url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', 'apps.main.views.experiment_edit', name='url_edit_experiment'),
diff --git a/apps/main/views.py b/apps/main/views.py
index 2ce4995..2771198 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -3,7 +3,7 @@ from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.contrib import messages
 
-from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm
+from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
 from .forms import OperationSearchForm
 from apps.cgs.forms import CGSConfigurationForm
 from apps.jars.forms import JARSConfigurationForm
@@ -290,21 +290,50 @@ def campaign(request, id_camp):
 
 def campaign_new(request):
     
+    kwargs = {}
+    
     if request.method == 'GET':
-        form = CampaignForm()
+                    
+        if 'template' in request.GET:
+            if request.GET['template']=='0':
+                form = NewForm(initial={'create_from':2},
+                               template_choices=Campaign.objects.filter(template=True).values_list('id', 'name'))
+            else:
+                kwargs['button'] = 'Create'
+                kwargs['experiments'] = Configuration.objects.filter(experiment=request.GET['template'])                
+                kwargs['experiment_keys'] = ['name', 'start_time', 'end_time']
+                form = CampaignForm(instance=Campaign.objects.get(pk=request.GET['template']),
+                                    initial={'template':False})                
+        elif 'blank' in request.GET:
+            kwargs['button'] = 'Create'
+            form = CampaignForm()
+        else:
+            form = NewForm()
         
     if request.method == 'POST':
-        form = CampaignForm(request.POST)
+        kwargs['button'] = 'Create'
+        post = request.POST.copy()
+        experiments = []
+        
+        for id_exp in post.getlist('experiments'):
+            exp = Experiment.objects.get(pk=id_exp)
+            new_exp = exp.clone(template=False)
+            experiments.append(new_exp)
+        
+        post.setlist('experiments', [])
+        
+        form = CampaignForm(post)
         
         if form.is_valid():
             campaign = form.save()
+            for exp in experiments:
+                campaign.experiments.add(exp)
+            campaign.save()
             return redirect('url_campaign', id_camp=campaign.id)
         
-    kwargs = {}
     kwargs['form'] = form
     kwargs['title'] = 'Campaign'
     kwargs['suptitle'] = 'New'
-    kwargs['button'] = 'Create'
         
     return render(request, 'campaign_edit.html', kwargs)
 
@@ -336,7 +365,13 @@ def campaign_delete(request, id_camp):
     
     if request.method=='POST':
         if request.user.is_staff:
+            
+            for exp in campaign.experiments.all():
+                for conf in Configuration.objects.filter(experiment=exp):
+                    conf.delete()
+                exp.delete()
             campaign.delete()
+            
             return redirect('url_campaigns')
         
         return HttpResponse("Not enough permission to delete this object")
@@ -348,14 +383,14 @@ def campaign_delete(request, id_camp):
 
 def experiments(request):
     
-    experiment_list = Experiment.objects.all().order_by('campaign')
+    experiment_list = Experiment.objects.all()
     
-    keys = ['id', 'name', 'start_time', 'end_time', 'campaign']
+    keys = ['id', 'name', 'start_time', 'end_time']
     
     kwargs = {}
     
     kwargs['experiment_keys'] = keys[1:]
-    kwargs['experiments'] = experiment_list#.values(*keys)
+    kwargs['experiments'] = experiment_list
     
     kwargs['title'] = 'Experiment'
     kwargs['suptitle'] = 'List'
@@ -367,12 +402,11 @@ def experiment(request, id_exp):
     
     experiment = get_object_or_404(Experiment, pk=id_exp)
     
-    experiments = Experiment.objects.filter(campaign=experiment.campaign)
     configurations = Configuration.objects.filter(experiment=experiment, type=0)
     
     kwargs = {}
     
-    exp_keys = ['id', 'campaign', 'location', 'name', 'start_time', 'end_time']
+    exp_keys = ['id', 'location', 'name', 'start_time', 'end_time']
     conf_keys = ['id', 'device__name', 'device__device_type', 'device__ip_address', 'device__port_address']
     
     conf_labels = ['id', 'device__name', 'device_type', 'ip_address', 'port_address']
@@ -380,8 +414,6 @@ def experiment(request, id_exp):
     kwargs['experiment_keys'] = exp_keys[1:]
     kwargs['experiment'] = experiment
     
-    kwargs['experiments'] = experiments.values(*exp_keys)
-    
     kwargs['configuration_labels'] = conf_labels[1:]
     kwargs['configuration_keys'] = conf_keys[1:]
     kwargs['configurations'] = configurations #.values(*conf_keys)
@@ -391,25 +423,48 @@ def experiment(request, id_exp):
     
     kwargs['button'] = 'Add Configuration'
     
+    ###### SIDEBAR ######
+    kwargs.update(sidebar(experiment=experiment))
+    
     return render(request, 'experiment.html', kwargs)
 
+
 def experiment_new(request, id_camp=None):
     
+    kwargs = {}
+    
     if request.method == 'GET':
-        form = ExperimentForm(initial={'campaign':id_camp})
+        if 'template' in request.GET:
+            if request.GET['template']=='0':
+                form = NewForm(initial={'create_from':2},
+                               template_choices=Experiment.objects.filter(template=True).values_list('id', 'name'))
+            else:
+                kwargs['button'] = 'Create'
+                kwargs['configurations'] = Configuration.objects.filter(experiment=request.GET['template'])                
+                kwargs['configuration_keys'] = ['name', 'device__name', 'device__ip_address', 'device__port_address']
+                form = ExperimentForm(instance=Experiment.objects.get(pk=request.GET['template']),
+                                      initial={'template':False})                
+        elif 'blank' in request.GET:
+            kwargs['button'] = 'Create'
+            form = ExperimentForm()
+        else:
+            form = NewForm()
         
     if request.method == 'POST':
-        form = ExperimentForm(request.POST, initial={'campaign':id_camp})
-        
+        form = ExperimentForm(request.POST)        
         if form.is_valid():
             experiment = form.save()
+
+            if 'template' in request.GET:
+                configurations = Configuration.objects.filter(experiment=request.GET['template'], type=0)            
+                for conf in configurations:
+                    conf.clone(experiment=experiment, template=False)
+            
             return redirect('url_experiment', id_exp=experiment.id)
-        
-    kwargs = {}
+            
     kwargs['form'] = form
     kwargs['title'] = 'Experiment'
     kwargs['suptitle'] = 'New'
-    kwargs['button'] = 'Create'
     
     return render(request, 'experiment_edit.html', kwargs)
 
@@ -441,9 +496,8 @@ def experiment_delete(request, id_exp):
     
     if request.method=='POST':
         if request.user.is_staff:
-            id_camp = experiment.campaign.id
             experiment.delete()
-            return redirect('url_campaign', id_camp=id_camp)
+            return redirect('url_experiments')
         
         return HttpResponse("Not enough permission to delete this object")
     
@@ -482,7 +536,7 @@ def dev_conf_new(request, id_exp=0, id_dev=0):
     
     initial = {}
     
-    if id_exp==0:
+    if id_exp<>0:
         initial['experiment'] = id_exp
     
     if id_dev<>0:
@@ -544,7 +598,7 @@ def dev_conf_edit(request, id_conf):
     kwargs['button'] = 'Update'
     
     ###### SIDEBAR ######
-    kwargs.update(sidebar(conf))
+    kwargs.update(sidebar(conf=conf))
     
     return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
 
@@ -612,12 +666,8 @@ def dev_conf_write(request, id_conf):
     if answer:
         messages.success(request, conf.message)
         
-        #Creating a historical configuration
-        conf.pk = None
-        conf.id = None
-        conf.type = 1
-        conf.template = 0
-        conf.save()
+        #Creating a historical configuration        
+        conf.clone(type=0, template=False)
         
         #Original configuration
         conf = DevConfModel.objects.get(pk=id_conf)
@@ -663,7 +713,7 @@ def dev_conf_read(request, id_conf):
     kwargs['button'] = 'Save'
     
     ###### SIDEBAR ######
-    kwargs.update(sidebar(conf))
+    kwargs.update(sidebar(conf=conf))
     
     return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
 
@@ -672,8 +722,7 @@ def dev_conf_import(request, id_conf):
     conf = get_object_or_404(Configuration, pk=id_conf)
     
     DevConfModel = CONF_MODELS[conf.device.device_type.name]
-    DevConfForm = CONF_FORMS[conf.device.device_type.name]
-    
+    DevConfForm = CONF_FORMS[conf.device.device_type.name]    
     conf = DevConfModel.objects.get(pk=id_conf)
     
     if request.method == 'GET':
@@ -688,7 +737,6 @@ def dev_conf_import(request, id_conf):
         
             if parms:
                 messages.success(request, "Parameters imported from: '%s'." %request.FILES['file'].name)
-                print parms
                 form = DevConfForm(initial=parms, instance=conf)
                 
                 kwargs = {}
@@ -701,7 +749,7 @@ def dev_conf_import(request, id_conf):
                 kwargs['previous'] = conf.get_absolute_url()
                 
                 ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
+                kwargs.update(sidebar(conf=conf))
                 
                 return render(request, '%s_conf_edit.html' % conf.device.device_type.name, kwargs)
 
@@ -714,7 +762,7 @@ def dev_conf_import(request, id_conf):
     kwargs['suptitle'] = 'Importing file'
     kwargs['button'] = 'Import'
     
-    kwargs.update(sidebar(conf))
+    kwargs.update(sidebar(conf=conf))
     
     return render(request, 'dev_conf_import.html', kwargs)
 
@@ -767,26 +815,32 @@ def dev_conf_delete(request, id_conf):
     kwargs = {'object':conf, 'conf_active':'active',
           'url_cancel':'url_dev_conf', 'id_item':id_conf}
     
-    ###### SIDEBAR ######
-    kwargs.update(sidebar(conf))
-    
     return render(request, 'item_delete.html', kwargs)
 
-def sidebar(conf):
+
+def sidebar(**kwargs):
     
-    kwargs = {}
+    side_data = {}
+    
+    conf = kwargs.get('conf', None)
+    experiment = kwargs.get('experiment', None)
     
-    if conf.experiment:
-        experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
-        configurations = Configuration.objects.filter(experiment=conf.experiment, type=0)
-        exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
-        kwargs['experiment_keys'] = exp_keys[1:]
-        kwargs['experiments'] = experiments.values(*exp_keys)    
-        conf_keys = ['id', 'device']            
-        kwargs['configuration_keys'] = conf_keys[1:]
-        kwargs['configurations'] = configurations #.values(*conf_keys)
+    if not experiment:
+        experiment = conf.experiment
+    
+    if experiment:
+        side_data['experiment'] = experiment
+        campaign = experiment.campaign_set.all()
+        if campaign:
+            side_data['campaign'] = campaign[0]
+            experiments = campaign[0].experiments.all()
+        else:
+            experiments = [experiment]
+        configurations = experiment.configuration_set.filter(type=0)
+        side_data['side_experiments'] = experiments
+        side_data['side_configurations'] = configurations
     
-    return kwargs
+    return side_data
 
 
 def operation(request, id_camp=None):
@@ -897,10 +951,11 @@ def radar_play(request, id_camp, id_radar):
         return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
 
 def radar_stop(request, id_camp, id_radar):
-    
+
     route = request.META['HTTP_REFERER']
     route = str(route)
     if 'search' in route:
         return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp]))
     else:
-        return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
\ No newline at end of file
+        return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
+    
diff --git a/apps/rc/forms.py b/apps/rc/forms.py
index 3ae13b6..b73ac79 100644
--- a/apps/rc/forms.py
+++ b/apps/rc/forms.py
@@ -64,8 +64,8 @@ class RCConfigurationForm(forms.ModelForm):
             
             devices = Device.objects.filter(device_type__name='rc')
             if instance.experiment:
-                self.fields['experiment'].widget.attrs['readonly'] = True
-                self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]            
+                self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
+                #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]            
             self.fields['device'].widget.choices = [(device.id, device) for device in devices]
             self.fields['ipp'].widget = KmUnitHzWidget(attrs={'km2unit':instance.km2unit})
             self.fields['clock'].widget.attrs['readonly'] = True
@@ -73,6 +73,8 @@ class RCConfigurationForm(forms.ModelForm):
         self.fields['time_before'].label = mark_safe(self.fields['time_before'].label)
         self.fields['time_after'].label = mark_safe(self.fields['time_after'].label)
     
+        if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
+            self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
     
     class Meta:
         model = RCConfiguration
diff --git a/apps/rc/models.py b/apps/rc/models.py
index 85b53f0..c9c3721 100644
--- a/apps/rc/models.py
+++ b/apps/rc/models.py
@@ -90,6 +90,20 @@ class RCConfiguration(Configuration):
         return 20./3*(self.clock_in/self.clock_divider)
 
 
+    def clone(self, **kwargs):
+        
+        lines = self.get_lines()
+        self.pk = None
+        self.id = None
+        for attr, value in kwargs.items():
+            setattr(self, attr, value)
+        self.save()
+        
+        for line in lines:
+            line.clone(rc_configuration=self)
+        
+        return self  
+
     def get_lines(self, type=None):
         '''
         Retrieve configuration lines 
@@ -304,6 +318,10 @@ class RCConfiguration(Configuration):
                 line.save()                     
         
 
+    def status_device(self):
+        
+        return 0
+
 class RCLineCode(models.Model):
     
     name = models.CharField(max_length=40)
@@ -333,7 +351,7 @@ class RCLineType(models.Model):
     
 class RCLine(models.Model):
     
-    rc_configuration = models.ForeignKey(RCConfiguration)
+    rc_configuration = models.ForeignKey(RCConfiguration, on_delete=models.CASCADE)
     line_type = models.ForeignKey(RCLineType)
     channel = models.PositiveIntegerField(default=0)
     position = models.PositiveIntegerField(default=0)
@@ -348,6 +366,17 @@ class RCLine(models.Model):
         if self.rc_configuration:
             return u'%s - %s' % (self.rc_configuration, self.get_name())
     
+    def clone(self, **kwargs):
+        
+        self.pk = None
+        
+        for attr, value in kwargs.items():
+            setattr(self, attr, value)
+        
+        self.save()    
+
+        return self
+    
     def get_name(self):
         
         chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
diff --git a/apps/rc/views.py b/apps/rc/views.py
index f1b934e..0ceaa4a 100644
--- a/apps/rc/views.py
+++ b/apps/rc/views.py
@@ -36,7 +36,7 @@ def conf(request, conf_id):
     
     kwargs['button'] = 'Edit Configuration'
     ###### SIDEBAR ######
-    kwargs.update(sidebar(conf))
+    kwargs.update(sidebar(conf=conf))
     
     return render(request, 'rc_conf.html', kwargs)
 
@@ -139,8 +139,6 @@ def conf_edit(request, conf_id):
     kwargs['suptitle'] = 'Edit'    
     kwargs['button'] = 'Update'
     kwargs['previous'] = conf.get_absolute_url()
-
-    kwargs.update(sidebar(conf))
     
     return render(request, 'rc_conf_edit.html', kwargs)
 
@@ -183,8 +181,6 @@ def add_line(request, conf_id, line_type_id=None, code_id=None):
     kwargs['dev_conf'] = conf
     kwargs['line_type'] = line_type
     
-    kwargs.update(sidebar(conf))
-    
     return render(request, 'rc_add_line.html', kwargs)
 
 def edit_codes(request, conf_id, line_id, code_id=None):