Commit 1c8d495c authored by Tibor Katelbach's avatar Tibor Katelbach
Browse files

repaired qr code

parent b03b1630
......@@ -30,6 +30,7 @@
<div class="col-xs-4">
<h1><span class="text-red">CO</span>NSTRUIRE</h1>
<h2><a href="default/view/page/roadmap/dir/docs|panels" class="lbhp">ROADMAP</a></h2>
<h2><a href="default/view/page/openatlas/dir/docs|panels" class="lbhp ">Projets</a></h2>
<h2><a href="default/view/page/smarterre/dir/docs|comprendre" class="lbhp ">Smarterre</a></h2>
<h2><a href="#default.view.page.index.dir.docs" data-dismiss="modal" class="lbh">D<span class="text-red">OC</span>S</a></h2>
<h2><a href="default/view/page/contact/dir/docs|panels" class="lbhp "><span class="text-red">CO</span>NTACT</a></h2>
......
......@@ -22,16 +22,6 @@
<br><br>
Au quotidien, Open Atlas fonctionne grâce à la présence permanente des développeurs, des commoners, et des acteurs sur le terrain, le meilleur moyen de les contacter est <a href="chat.lescommuns.org" target="_blank">ici</a> .
<br>Numéro siret : 513 381 830 00019
<br><br><br>
<span class="bold">
<br>1. We believe in an open exchange.
<br>2. We believe in the power of participation.
<br>3. We believe in rapid prototyping.
<br>4. We believe in meritocracy.
<br>5. We believe in community
</span>
<br><a href="http://www.framablog.org/index.php/post/2011/09/28/the-open-source-way" target="_blanck">the-open-source-way</a>
</div>
......
......@@ -3,7 +3,7 @@
<span class="panel-title homestead"> <i class='fa fa-heart faa-pulse animated fa-3x '></i> <span style="font-size: 48px">PHILOSOPHY</span></span>
</div>
<div class="space20"></div>
<div class="keywordList col-xs-6 col-xs-offset-3"></div>
<div class="keywordList"></div>
<script type="text/javascript">
......@@ -17,6 +17,18 @@ var keywords = [
"<br>Experimentons un autre vision du système"+
"<br>Le système peut il fonctionner autrement"
},
{
"icon" : "fa-code",
"title":"Open source",
"body":'<span class="bold">'+
'<br>1. We believe in an open exchange. '+
'<br>2. We believe in the power of participation. '+
'<br>3. We believe in rapid prototyping.'+
'<br>4. We believe in meritocracy. '+
'<br>5. We believe in community'+
'</span>'+
'<br><a class="btn btn-default" href="http://www.framablog.org/index.php/post/2011/09/28/the-open-source-way" target="_blanck">the-open-source-way</a>'
},
{
"icon" : "fa-lightbulb-o",
"title":"C'est pas un parti politique",
......@@ -45,7 +57,7 @@ jQuery(document).ready(function()
icon = (obj.icon) ? obj.icon : "fa-tag" ;
color = (obj.color) ? obj.color : "#E33551" ;
$(".keywordList").append(
'<div class="panel panel-white">'+
'<div class="col-xs-4 panel-white">'+
'<div class="panel-heading border-light ">'+
'<span class="panel-title homestead"> <i class="fa '+icon+' fa-2x"></i> <span style="font-size: 35px; color:'+color+';"> '+obj.title.toUpperCase()+'</span></span>'+
'</div>'+
......
......@@ -21,6 +21,7 @@
'/plugins/showdown/showdown.min.js',
//MARKDOWN
'/plugins/to-markdown/to-markdown.js',
'/plugins/jquery.qrcode/jquery-qrcode.min.js',
);
HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFilesTheme, Yii::app()->request->baseUrl);
......@@ -563,6 +564,8 @@
KScrollTo("#topPosKScroll");
initDateHeaderPage(contextData);
//Sig.showMapElements(Sig.map, mapElements);
var elemSpec = dyFInputs.get("<?php echo $type?>");
buildQRCode( elemSpec.ctrl ,"<?php echo (string)$element["_id"]?>");
});
......
......@@ -6,12 +6,12 @@
<div class="col-xs-12 col-sm-5 col-sm-offset-1" >
<h3 class="pull-left homestead text-red">Cartes de visites </h3>
<div class="row center">
<div class="col-xs-12 center">
<div style="border:1px dashed #666; width:400px;min-height:160px;padding:5px;margin:5px;">
<img class="pull-left" width="150" src="<?php echo $img ?>">
<img class=" col-xs-5 img-responsive" src="<?php echo $img ?>">
<ul class="pull-left" style="list-style: none;margin-top:10px;">
<ul class="col-xs-7" style="list-style: none;margin-top:10px;">
<?php echo (@$type && @OpenData::$elementTypes[$type]) ?
"<li class='btn btn-sm'>".OpenData::$elementTypes[$type]."</li>" : '' ?>
<?php echo (@$name) ? "<li class='bold'>".$name."</li>" : '' ?>
......@@ -27,12 +27,12 @@
<div class="col-xs-12 col-sm-5 " >
<h3 class="pull-left homestead text-red">Cartes de visites connectée</h3>
<div class="row center">
<div class="col-xs-12 center">
<div style="border:1px dashed #666; width:400px;min-height:160px;padding:5px;margin:5px;">
<div class="pull-left qrCode"> </div>
<div class="col-xs-5 qrCode"> </div>
<ul class="pull-left" style="list-style: none;margin-top:10px;">
<ul class="col-xs-7" style="list-style: none;margin-top:10px;">
<?php echo (@$type && @OpenData::$elementTypes[$type]) ?
"<li class='btn btn-sm'>".OpenData::$elementTypes[$type]."</li>" : '' ?>
<?php echo (@$name) ? "<li class='bold'>".$name."</li>" : '' ?>
......@@ -43,9 +43,9 @@
<?php echo (@$tel) ? "<li>".$tel."</li>" : '' ?>m
</ul>
</div>
</div>
<div class="space20"></div>
<div class="row">
</div>
<div class="col-xs-12">
<span class="text-red"><i class="fa fa-warning "></i> Ce QR Code devient interactif avec l'application <a href="https://play.google.com/store/apps/details?id=org.communevent.meteor.pixelhumain&ah=lVN3mXqHKQjIOg3qHn0YzhiUebc&hl=fr" target="_blank">COMOBI</a></span>
</div>
<br/>
......
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