Skip to content

GitLab

B
backend-mcafee
Commit bee2f489 authored by Cristian Mauricio Diaz Canales's avatar Cristian Mauricio Diaz Canales 💬
Browse files
Options

Mejoras menores 

prueba de css
parent 9ea28b8f
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 3 deletions
app/Resources/views/front/campania/prueba.html.twig
View file @ bee2f489
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="{{asset('assets/frontend/css/templates/'~templateCss~'')}}">
</head> </head>
<body> <body>
<div id="headContainer"> <div id="headContainer">
......
src/AppBundle/Lib/Utiles.php
View file @ bee2f489
...@@ -34,7 +34,7 @@ class Utiles { ...@@ -34,7 +34,7 @@ class Utiles {
} }
return ( return (
preg_match('/(Mobile|Android|Tablet|GoBrowser|[0-9]x[0-9]*|uZardWeb\/|Mini|Doris\/|Skyfire\/|iPhone|Fennec\/|Maemo|Iris\/|CLDC\-|Mobi\/)/uis') preg_match('/(Mobile|Android|Tablet|GoBrowser|[0-9]x[0-9]*|uZardWeb\/|Mini|Doris\/|Skyfire\/|iPhone|Fennec\/|Maemo|Iris\/|CLDC\-|Mobi\/)/uis', $useragent)
//preg_match('/(android|bb\d+|meego|Android|Iphone|Mobile|Android|Tablet|GoBrowser|[0-9]x[0-9]*|uZardWeb\/|Mini|Doris\/|Skyfire\/|iPhone|Fennec\/|Maemo|Iris\/|CLDC\-|Mobi\/).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i', $useragent) || //preg_match('/(android|bb\d+|meego|Android|Iphone|Mobile|Android|Tablet|GoBrowser|[0-9]x[0-9]*|uZardWeb\/|Mini|Doris\/|Skyfire\/|iPhone|Fennec\/|Maemo|Iris\/|CLDC\-|Mobi\/).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i', $useragent) ||
//preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i', substr($useragent, 0, 4)) //preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i', substr($useragent, 0, 4))
//); //);
......
src/CampaniaBundle/Controller/CampaniaController.php
View file @ bee2f489
...@@ -494,7 +494,7 @@ class CampaniaController extends Controller { ...@@ -494,7 +494,7 @@ class CampaniaController extends Controller {
); );
try { try {
$url = "http://backend.mcafeeterritorios.gearlabs.cl/api/mcafee/campania/obtener/contenido.json"; $url = Utiles::getParametroConfiguracion("url_base")."/api/mcafee/campania/obtener/contenido.json";
$ch = curl_init($url); $ch = curl_init($url);
//curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json')); //curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POST, 1);
...@@ -512,7 +512,7 @@ class CampaniaController extends Controller { ...@@ -512,7 +512,7 @@ class CampaniaController extends Controller {
} }
//print_r($htmlContent); //print_r($htmlContent);
//exit(); //exit();
return $this->render('front/campania/prueba.html.twig', array("headContent" => $htmlContent["contenidoHead"], "bodyContent" => $htmlContent["contenidoBody"], "footerContent" => $htmlContent["contenidoFooter"])); return $this->render('front/campania/prueba.html.twig', array("templateCss" => $htmlContent["templateCss"], "headContent" => $htmlContent["contenidoHead"], "bodyContent" => $htmlContent["contenidoBody"], "footerContent" => $htmlContent["contenidoFooter"]));
} }
public function loadDataContenidoAction(Request $request) { public function loadDataContenidoAction(Request $request) {
......
src/WsBundle/Controller/v1/CampaniaApiController.php
View file @ bee2f489
...@@ -91,6 +91,9 @@ class CampaniaApiController extends ApiController { ...@@ -91,6 +91,9 @@ class CampaniaApiController extends ApiController {
$template = $campania->getTemplate(); $template = $campania->getTemplate();
$szerHtmlContenido = new szerHtmlContenido(); $szerHtmlContenido = new szerHtmlContenido();
$log->debug("seteando template..");
$szerHtmlContenido->setTemplateCss($template->getTemCss());
$log->debug("guardando salida Head en szerHtmlContenido ..."); $log->debug("guardando salida Head en szerHtmlContenido ...");
$szerHtmlContenido->setContenidoHead($this->generateHeadHtmlStructure($log, $esMovil, $szerValidatorCampania, $template)); $szerHtmlContenido->setContenidoHead($this->generateHeadHtmlStructure($log, $esMovil, $szerValidatorCampania, $template));
......
src/WsBundle/Controller/v1/serializer/szerHtmlContenido.php
View file @ bee2f489
...@@ -16,6 +16,15 @@ use Symfony\Component\Validator\Constraints as Assert; ...@@ -16,6 +16,15 @@ use Symfony\Component\Validator\Constraints as Assert;
*/ */
class szerHtmlContenido { class szerHtmlContenido {
/**
* Nombre del css asociado al template
* @Assert\NotBlank
* @Type("string")
* @var string
*/
private $templateCss;
/** /**
* Array Contenido del HEAD. * Array Contenido del HEAD.
* @Assert\NotNull * @Assert\NotNull
...@@ -67,6 +76,14 @@ class szerHtmlContenido { ...@@ -67,6 +76,14 @@ class szerHtmlContenido {
$this->contenidoFooter = $contenidoFooter; $this->contenidoFooter = $contenidoFooter;
} }
public function getTemplateCss() {
return $this->templateCss;
}
public function setTemplateCss($templateCss) {
$this->templateCss = $templateCss;
}
......
web/assets/frontend/css/templates/template1.css 0 → 100644
View file @ bee2f489
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 05-oct-2020, 12:08:55
Author : cdiaz
*/
.clase51{
background-color: blue;
}
.clase57{
background-color: green;
}
\ No newline at end of file
web/assets/frontend/css/templates/template2.css 0 → 100644
View file @ bee2f489
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 05-oct-2020, 12:09:07
Author : cdiaz
*/
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