Merge branch 'Internal_Festivals' into Internal

www-admin/css/lablanca.css

@@ -165,6 +165,51 @@ div#form_new_offer div#controls input{
     margin:    2em 4em 2em 4em;
 }
 
+div#section_schedule div#status_schedule table{
+	width:            100%;
+  margin:           auto;
+  border-collapse:  collapse;
+}
+
+div#section_schedule div#status_schedule table tr{
+	width: 100%;
+}
+
+div#section_schedule div#status_schedule table tr td{
+	padding: 0.3em;
+	border: 0.1em solid black;
+  text-align: center;
+}
+
+div#section_schedule div#status_schedule table tr td.time{
+	width: 25%;
+}
+
+div#section_schedule div#status_schedule table tr td.name{
+	width: 20%;
+}
+
+div#section_schedule div#status_schedule table tr td.description{
+	width: 45%;
+}
+
+div#section_schedule div#status_schedule table tr td.details{
+  width: 20%;
+}
+
+div#section_schedule div#status_schedule table tr td.details select{
+	width: 100%;
+}
+
+div#section_schedule div#status_schedule table tr td input{
+	width: 100%;
+}
+
+div#section_schedule div#status_schedule table tr td input[type='text'].short, input[type='number'].short{
+	width: 2.5em;
+	margin: 0em;
+}
+
 div.entry_schedule table.new_event{
     width:                        80%;
     margin:                        auto;

www-admin/lablanca/calculate.php

@@ -9,16 +9,16 @@
     else{
         //Get year
         $year = date("Y");
-        
+
         //Get data to calculate
         $section = mysqli_real_escape_string($con, $_GET['section']);
-        
+
         switch ($section){
-        
+
             //Calculate header section. Only the progress window is requires
             case 'header':
                 echo "<h4>Paso 1: Cabecera de la p&aacute;gina de fiestas</h4>\n";
-//                 echo "<div class='entry status' id='status_header'>\n";
+                // echo "<div class='entry status' id='status_header'>\n";
                 echo "Estado:\n";
                 $q = mysqli_query($con, "SELECT * FROM festival WHERE year = $year;");
                 if (mysqli_num_rows($q) == 0){
@@ -50,7 +50,7 @@
                     echo "</li></ul>\n";
                 }
                 break;
-                
+
             //Calculate prices progress section.
             case 'pricesprogress':
                 echo "Estado:<ul><li>\n";
@@ -84,7 +84,7 @@
                 }
                 echo "</li></ul>\n";
                 break;
-        
+
             //Calculate offers window
             case 'pricesoffers':
                 echo "<h4>Ofertas:</h4>\n";
@@ -142,19 +142,14 @@
                         $q = mysqli_query($con, "SELECT * FROM festival_event WHERE gm = 1 AND start > str_to_date('$year-07-25 08:00:00', '%Y-%m-%d %T') AND start < str_to_date('$year-07-26 07:59:59', '%Y-%m-%d %T');");
                         break;
                     case '5':
-                    
                         break;
                     case '6':
-                    
                         break;
                     case '7':
-                    
                         break;
                     case '8':
-                    
                         break;
                     case '9':
-                    
                         break;
                     default:
                         exit(-1);

www-admin/lablanca/index.php

@@ -157,7 +157,7 @@
                     <h3><img src='/img/misc/slid-right.png' onClick='expandSchedule(25);'/>25 de julio</h4>
                     <div id='list_schedule_25' class='list_schedule'>
                     </div>
-                    Nuevo: 
+                    Nuevo:
                     <table class='new_event'>
                         <tr class='title'>
                             <th>Castellano</th>
@@ -186,7 +186,7 @@
                         <tr>
                             <td>
                                 <input type='number' value='00' id='new_event_25_start_h'/>:
-                                <input type='number' value='00' id='new_event_25_start_m'/> -- 
+                                <input type='number' value='00' id='new_event_25_start_m'/> --
                                 <input type='number' id='new_event_25_end_h'/>:
                                 <input type='number' id='new_event_25_end_m'/>
                             </td>
@@ -255,7 +255,6 @@
                 </div>
             </div>
         </div>
-        
     </body>
 </html>
 <?php } ?>

www-admin/lablanca/script.js

@@ -36,7 +36,7 @@ function saveNewOffer(year){
     var text_eu = document.getElementById('new_offer_text_eu').value;
     var days = document.getElementById('new_offer_days').value;
     var price = document.getElementById('new_offer_price').value;
-    
+
     //Validate values
     if (name_es.length == 0){
         alert("Debes introducir el nombre, al menos en castellano.");
@@ -58,7 +58,7 @@ function saveNewOffer(year){
         document.getElementById('new_offer_days').focus();
         return;
     }
-    
+
     // Encode required values
     name_es = encodeURI(name_es);
     name_en = encodeURI(name_en);
@@ -66,11 +66,11 @@ function saveNewOffer(year){
     text_es = encodeURI(text_es);
     text_en = encodeURI(text_en);
     text_eu = encodeURI(text_eu);
-    
+
     // Get page
     if(XMLHttpRequest)
         var x = new XMLHttpRequest();
-    else 
+    else
         var x = new ActiveXObject("Microsoft.XMLHTTP");
     x.open("POST", "/lablanca/insertoffer.php", true);
     var params = "year=" + year + "&name_es=" + name_es + "&name_en=" + name_en + "&name_eu=" + name_eu + "&text_es=" + text_es + "&text_en=" + text_en + "&text_eu=" + text_eu + "&price=" + price + "&days=" + days;
@@ -114,7 +114,7 @@ function calculate(section){
                 // Get page
                 if(XMLHttpRequest)
                     var x = new XMLHttpRequest();
-                else 
+                else
                     var x = new ActiveXObject("Microsoft.XMLHTTP");
                 x.open("GET", "/lablanca/calculate.php?section=pricesprogress", true);
                 x.send();
@@ -129,7 +129,7 @@ function calculate(section){
                 // Get page
                 if(XMLHttpRequest)
                     var x = new XMLHttpRequest();
-                else 
+                else
                     var x = new ActiveXObject("Microsoft.XMLHTTP");
                 x.open("GET", "/lablanca/calculate.php?section=pricesoffers", true);
                 x.send();
@@ -147,50 +147,11 @@ function calculate(section){
     }
 }
 
-function uploadHeaderImage(event, id){
-    var selectedFile = event.target.files[0];
-    
-    //Set image on page
-    var reader = new FileReader();
-    var imgtag = document.getElementById("header_img");
-    reader.onload = function(event) {
-        imgtag.src = event.target.result;
-        
-        //Upload image;
-        var formData = new FormData();
-        var file = document.getElementById('header_img_selector').files[0];
-        formData.append('img', selectedFile, selectedFile.name);
-        //for(var pair of formData.entries()) {
-        //    console.log(pair[0]+ ', '+ pair[1]); 
-        //}
-        //console.log("FD" + formData);
-        
-        // Get page
-        if(XMLHttpRequest)
-            var x = new XMLHttpRequest();
-        else 
-            var x = new ActiveXObject("Microsoft.XMLHTTP");
-        x.open("POST", "/lablanca/uploadimage.php?type=header&id=" + id, true);
-        x.onload = function(){
-        if(x.readyState == 4){
-            if(x.status == 200)
-                console.log("TRUE")
-                return true;
-            }
-            else{
-                console.log("FASLE");
-            }
-        }
-        x.send(formData);
-    };
-    reader.readAsDataURL(selectedFile);
-}
-
 function updateField(table, field, value, id, type = 'text', canBeNull = true){
     // Get page
     if(XMLHttpRequest)
         var x = new XMLHttpRequest();
-    else 
+    else
         var x = new ActiveXObject("Microsoft.XMLHTTP");
     x.open("POST", "/lablanca/execute.php", true);
     var params = "action=update&table=" + table + "&field=" + field + "&value=" + encodeURI(value) + "&id=" + id + "&type=" + type;
@@ -208,7 +169,7 @@ function deleteOffer(id){
     // Get page
     if(XMLHttpRequest)
         var x = new XMLHttpRequest();
-    else 
+    else
         var x = new ActiveXObject("Microsoft.XMLHTTP");
     x.open("POST", "/lablanca/execute.php", true);
     var params = "action=delete&table=festival_offer&id=" + id;
@@ -220,4 +181,4 @@ function deleteOffer(id){
         }
     }
     x.send(params);
-}
+}