ABS/abscontrol Commit - r132:133 · Jicamarca Repository

- Arregalado el estilo para la presentacion del formulario newProfile.

jsalyrosas -

r132:133

parent child

Context file:

r132:133

Collapse all files

trunk/webapp/abscontrol/views.py +49 -1

             from django.shortcuts import render_to_response, redirect
             from abscontrol.models import Profile, AntennaDown, AntennaUp
   No newline at end of file
             def index(request):
                 #latest_poll_list = profileAntenna.objects.all().order_by('-pub_date')[:5]
                 profile_list = Profile.objects.all()
                 return render_to_response('abscontrol/index.html', {'profile_list': profile_list})
   No newline at end of file
             def new(request):
                 profile_list = Profile.objects.all()
                 txtAntenna = "[[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
-                return render_to_response('abscontrol/new.html', {'profile_list': profile_list})
  No newline at end of file
+             No newline at end of file
+                             "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
              No newline at end of file
+                             "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
              No newline at end of file
+                             "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
              No newline at end of file
+                             "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
              No newline at end of file
+                             "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \
              No newline at end of file
+                             "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \
              No newline at end of file
+                             "[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]]"
              No newline at end of file
+                txtTxUp = "[[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]]"
              No newline at end of file
+                txtTxDown = "[[1,1,1,1,0,0,0,0]," \
              No newline at end of file
+                            "[1,1,1,1,0,0,0,0]," \
              No newline at end of file
+                            "[1,1,1,1,0,0,0,0]," \
              No newline at end of file
+                            "[1,1,1,1,0,0,0,0]," \
              No newline at end of file
+                            "[0,0,0,0,1,1,1,1]," \
              No newline at end of file
+                            "[0,0,0,0,1,1,1,1]," \
              No newline at end of file
+                            "[0,0,0,0,1,1,1,1]," \
              No newline at end of file
+                            "[0,0,0,0,1,1,1,1]]"
              No newline at end of file
+                txtRxUp = "[[0,0,0,0,1,1,1,1]," \
              No newline at end of file
+                          "[0,0,0,0,1,1,1,1]," \
              No newline at end of file
+                          "[0,0,0,0,1,1,1,1]," \
              No newline at end of file
+                          "[0,0,0,0,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                          "[1,1,1,1,1,1,1,1]]"
              No newline at end of file
+                txtRxDown = "[[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                            "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                            "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                            "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                            "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                            "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                            "[1,1,1,1,1,1,1,1]," \
              No newline at end of file
+                            "[1,1,1,1,1,1,1,1]]"
              No newline at end of file
              No newline at end of file
+                txtUes = "[0.533333,0.00000,1.06667,0.00000]"
              No newline at end of file
              No newline at end of file
+                return render_to_response('abscontrol/new.html', {'profile_list': profile_list,
              No newline at end of file
+                                                                  'txtAntenna' : txtAntenna,
              No newline at end of file
+                                                                  'txtUes' : txtUes, 'txtTxUp' : txtTxUp,
              No newline at end of file
+                                                                  'txtTxDown' : txtTxDown, 'txtRxUp' : txtRxUp,
              No newline at end of file
+                                                                  'txtRxDown' : txtRxDown,
              No newline at end of file
+                                                                  })
  No newline at end of file
   No newline at end of file
             def save(request):
   No newline at end of file
                 txtProfile = request.POST["txtProfile"]
   No newline at end of file
                 txtAntennaUp = request.POST["txtAntennaUp"]
                 txtTxUp = request.POST["txtTxUp"]
                 txtRxUp = request.POST["txtRxUp"]
                 txtUesUp = request.POST["txtUesUp"]
   No newline at end of file
                 txtAntennaDown = request.POST["txtAntennaDown"]
                 txtTxDown = request.POST["txtTxDown"]
                 txtRxDown = request.POST["txtRxDown"]
                 txtUesDown = request.POST["txtUesDown"]
   No newline at end of file
                 newprofile = Profile(name=txtProfile)
                 newprofile.save()
   No newline at end of file
                 newpattern = newprofile.pattern_set.create(value=1)
                 newpattern.antennaup_set.create(value=txtAntennaUp,
                                                 tx=txtTxUp,rx=txtRxUp,
                                                 ues=txtUesUp)
                 newpattern.antennadown_set.create(value=txtAntennaDown,
                                                   tx=txtTxDown,rx=txtRxDown,
                                                   ues=txtUesDown)
   No newline at end of file
                 newurl = '/abscontrol/view/%d' % newprofile.id
                 #return redirect('/abscontrol/')
                 return redirect(newurl)
   No newline at end of file
             def view(request, profile_id):
                 if request.method == 'GET' and 'pattern' in request.GET:
                     pattern_value = request.GET["pattern"]
                 else:
                     pattern_value = 1
   No newline at end of file
                 profile_list = Profile.objects.all()
                 objProfile = Profile.objects.get(pk=profile_id)
   No newline at end of file
                 lsPatterns = objProfile.pattern_set.all()
                 patternChoosen = objProfile.pattern_set.get(value=pattern_value)
                 objAntennaUp = patternChoosen.antennaup_set.get()
                 objAntennaDown = patternChoosen.antennadown_set.get()
   No newline at end of file
                 return render_to_response('abscontrol/view.html', {'objProfile': objProfile, 'profile_list': profile_list,
                                                                    'patternChoosen' : patternChoosen, 'lsPatterns' : lsPatterns,
                                                                    'antennaUp' : objAntennaUp, 'antennaDown' : objAntennaDown,
                                                                    })

trunk/webapp/static/css/style.css +9 -3

             @font-face {
               font-family: 'Open Sans';
               font-style: normal;
               font-weight: 300;
               src: local('Open Sans Light'), local('OpenSans-Light'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: normal;
               font-weight: 400;
               src: local('Open Sans'), local('OpenSans'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: normal;
               font-weight: 600;
               src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/MTP_ySUJH_bn48VBG8sNSnhCUOGz7vYGh680lGh-uXM.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: normal;
               font-weight: 700;
               src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: normal;
               font-weight: 800;
               src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hnhCUOGz7vYGh680lGh-uXM.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: italic;
               font-weight: 300;
               src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxh_xHqYgAV9Bl_ZQbYUxnQU.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: italic;
               font-weight: 400;
               src: local('Open Sans Italic'), local('OpenSans-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: italic;
               font-weight: 600;
               src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxn5HxGBcBvicCpTp6spHfNo.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: italic;
               font-weight: 700;
               src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxjqR_3kx9_hJXbbyU8S6IN0.woff) format('woff');
             }
             @font-face {
               font-family: 'Open Sans';
               font-style: italic;
               font-weight: 800;
               src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxkCDe67GEgBv_HnyvHTfdew.woff) format('woff');
             }
   No newline at end of file
             body {font-size: 11px; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif}
             article, aside, figure, footer, header, hgroup, nav, section { display:block; }
             header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px}
             #schema {margin: 0 auto; width: 980px; border: 1px solid #f00; padding: 10px 10px 10px 10px}
             #content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px}
             #content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; font-family: Monaco;}
             #content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;}
             footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px}
   No newline at end of file
             .cleardivs {clear: both; border: 1px solid #400; height: 0px}
   No newline at end of file
   No newline at end of file
             /****************************************************************************************/
             /******                 MENU DE NAVEGACION DE PERFILES **********************************/
             /****************************************************************************************/
             #content #infoProfiles {border: 1px solid #d00; width: 140px; margin: 0px; padding-top: 2px; padding-bottom: 2px}
             .lblInfo {padding-left: 12px; line-height: 20px;}
             #infoProfiles select {padding-left: 12px; line-height: 20px;margin-left: 12px}
             #content nav {border: 1px solid #c55; width: 140px; margin: 0px; font-family: Monaco; font-size: 1.2em;}
             #content nav ul{list-style: none; list-style-type: none; margin: 15px 15px 15px 15px; padding-left: 20px; border: 0px solid #eee}
             #content nav ul li{line-height: 20px}
   No newline at end of file
             /****************************************************************************************/
             /********               FORMULARIO DE PERFILES      *************************************/
             /****************************************************************************************/
             #divProfile {border: 0px solid #dff; margin: 10px 0px; padding: 10px 10px; width: 500px}
             .flsAntenna {margin: 10px 0px; width: 750px; padding: 10px 10px}
             #divPattern textarea,input[type=text],label {font-family: Monaco; font-size: inherit;}
   No newline at end of file
-            #divPattern input[type=text] {width: 200px}
  No newline at end of file
             #divPattern textarea {resize: none; overflow: hidden}
              No newline at end of file
-            .divAntenna {float: left; margin: 10px; height: 150px}
  No newline at end of file
+             No newline at end of file
+            .divAntenna {float: left; margin: 10px; height: 160px; border: 1px solid #fcc !important; width: 260px}
  No newline at end of file
             .divAntenna label {display: block}
+            .txtAntenna {max-width: 250px; max-height: 125px; width: 250px; height: 125px}
              No newline at end of file
+  No newline at end of file
             .divTx {display: block; float: left; margin: 10px; height: 150px}
             .divTx label {display: block}
+            .divTx textarea {width: 135px; max-width: 135px; height: 125px; max-height: 125px; text-align: justify}
              No newline at end of file
+  No newline at end of file
             .divUes {display: block; margin: 10px}
             .divUes input[type=text] {width: 240px; max-width: 240px;}
-            .txtAntenna {max-width: 200px; max-height: 120px}
  No newline at end of file
+             No newline at end of file
+  No newline at end of file

trunk/webapp/templates/abscontrol/new.html +8 -8

             {% extends "abscontrol/index.html" %}
             {% block title %}ABS CONTROL:::::NEW PROFILE{% endblock %}
   No newline at end of file
             {% block maincolumn%}
             <div id="maincolumn">
                 <form action="/abscontrol/save/" method="post">
                 <div id="divProfile">
                     <label for="lblName">Profile:</label>
                     <input type="text" name="txtProfile" id="" value="" />
                     <input type="submit" value="Save" />
                 </div>
                 <div id="divPattern">
                     <div id="antennaUp">
                         <fieldset class="flsAntenna">
                             <legend>UP</legend>
                             <div class="divAntenna">
                                 <label for="lblAntenna">Antenna</label>
                                 <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8">{{ txtAntenna }}</textarea>  
  No newline at end of file
-                                <textarea name="txtAntennaUp" class="txtAntenna" cols="38" rows="8"></textarea>  
  No newline at end of file
                             </div>
                             <div class="divTx">
                                 <label for="lblTx">Tx</label>
                                 <textarea name="txtTxUp" class="txtTR" cols="20" rows="8">{{ txtTxUp }}</textarea>    
  No newline at end of file
-                                <textarea name="txtTxUp" class="txtTR" cols="20" rows="8"></textarea>    
  No newline at end of file
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
                                 <textarea name="txtRxUp" class="txtTR" cols="20" rows="8">{{ txtRxUp }}</textarea>    
  No newline at end of file
-                                <textarea name="txtRxUp" class="txtTR" cols="20" rows="8"></textarea>    
  No newline at end of file
                             </div>
                             <div class="cleardivs"></div>
                             <div class="divUes">
                                 <label for="lblUes">Ues:</label>
                                 <input type="text" name="txtUesUp" value="{{ txtUes }}" />
  No newline at end of file
-                                <input type="text" name="txtUesUp" value="" />
  No newline at end of file
                             </div>
                         </fieldset>
                     </div>
                     <div id="antennaDown">
                         <fieldset class="flsAntenna">
                             <legend>DOWN</legend>
                             <div class="divAntenna">
                                 <label for="lblAntenna">Antenna</label>
                                 <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8">{{ txtAntenna }}</textarea>    
  No newline at end of file
-                                <textarea name="txtAntennaDown" class="txtAntenna" cols="38" rows="8"></textarea>    
  No newline at end of file
                             </div>
                             <div class="divTx">
                                 <label for="lblTx">Tx</label>
                                 <textarea name="txtTxDown" class="txtTR" cols="20" rows="8">{{ txtTxDown }}</textarea>
  No newline at end of file
-                                <textarea name="txtTxDown" class="txtTR" cols="20" rows="8"></textarea>
  No newline at end of file
                             </div>
                             <div class="divTx">
                                 <label for="lblRx">Rx</label>
                                 <textarea name="txtRxDown" class="txtTR" cols="20" rows="8">{{ txtRxDown }}</textarea>    
  No newline at end of file
-                                <textarea name="txtRxDown" class="txtTR" cols="20" rows="8"></textarea>    
  No newline at end of file
                             </div>
                             <div class="cleardivs"></div>
                             <div class="divUes">
                                 <label for="lblUes">Ues:</label>
                                 <input type="text" name="txtUesDown" value="{{ txtUes }}" />
  No newline at end of file
-                                <input type="text" name="txtUesDown" value="" />
  No newline at end of file
                             </div>
                         </fieldset>
                     </div>
                 </div>
                 </form>
             </div>
             {% endblock %}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages