Skip to content

C
clinicaltrials
Commit 220b8928 authored by Romain Loth's avatar Romain Loth
Browse files
Options

minor paths and dependancy adjustments

parent c66287aa
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 52 deletions
directory_content.php
View file @ 220b8928
<?php
// calcul les différents profils à partir d'une requete
// sort un $content
// sort un $content
echo '
echo '
<body>';
include ("analytics.php");
echo ' <script type="text/javascript" src="js/whoswho.js"></script>
echo ' <script type="text/javascript" src="js/jquery/jquery-1.7.min.js"></script>
<script type="text/javascript" src="js/whoswho.js"></script>
<div class="container">
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="hero-unit">
';
......@@ -17,7 +18,7 @@ echo ' <script type="text/javascript" src="js/whoswho.js"></script>
$imsize = 150;
$content='';
......@@ -33,8 +34,8 @@ foreach ($scholars as $scholar) {
}
$loop+=1;
$content.= '<div class="row">
<div class="span12">
<div class="row">
<div class="span12">
<div class="row">
<div class="span9" align="justify">';
$content .= '<div>';
if ($scholar['photo_url'] != null) {
......@@ -53,9 +54,9 @@ foreach ($scholars as $scholar) {
if (($scholar['position'] != null)||($scholar['lab'] != null)||($scholar['affiliation'] != null)) {
$content .= '<dl>';
}
if ($scholar['position'] != null) {
$content .= '<dt>' . $scholar['position'] . '</dt>';
}
$affiliation = '';
......@@ -66,7 +67,7 @@ foreach ($scholars as $scholar) {
if ($scholar['affiliation'] != null) {
$affiliation.=$scholar['affiliation'];
$orga_list[]=$scholar['affiliation'];
//echo $scholar['affiliation'].'<br/>';
//$lab_query.='OR name="'.$scholar['affiliation'].'" ';
......@@ -111,13 +112,13 @@ foreach ($scholars as $scholar) {
} else {
$content .= '<dd><i class="icon-user"></i> CSS Member</dd> ';
}
}
if (($scholar['position'] != null)||($scholar['lab'] != null)||($scholar['affiliation'] != null)) {
$content .= '</dl>';
}
$content .= '</div>';
......@@ -133,11 +134,11 @@ foreach ($scholars as $scholar) {
if (($scholar['keywords'] != null) || ($scholar['address'] != null) || ($scholar['phone'] != null)) {
$content .= '<div class="span3" align="justify">';
if ($scholar['keywords'] != null){
$content .= '<i class="icon-tags"></i> ' . clean_exp($scholar['keywords']). '.<br/><br/>';
$content .= '<i class="icon-tags"></i> ' . clean_exp($scholar['keywords']). '.<br/><br/>';
}
if ($scholar['address'] != null) {
$content .= '<address><i class="icon-envelope"></i> ' . $scholar['address'] . '<br/>' . $scholar['city'] . '<br/>' . $scholar['postal_code'] . '<br/></address>';
}
......@@ -150,16 +151,16 @@ foreach ($scholars as $scholar) {
}
if ($scholar['fax'] != null) {
$content .='<strong>Fax</strong>: '.$scholar['fax'] . '<br/>';
}
}
}
$content .= '</div>';
}
}
$content .= '</div>';
$content .= '</div>';
$content .= '</div>';
$content .= '
<center><img src="img/bar.png"></center>';
$content .= '<br/>';
......@@ -246,9 +247,9 @@ foreach ($orga_list as $name) {
$info['fax'] = $row['fax'];
$info['login'] = $row['login'];
$organiz[$row['id']] = $info;
$temp=false;
$temp=false;
}
}
}
}
}
......
index.html
View file @ 220b8928
......@@ -17,6 +17,10 @@
-->
<link href="css/bootstrap_index.css" rel="stylesheet">
<link href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css'>
<!-- TODO test if each is really needed -->
<!-- TODO group under a static dir for serving -->
<!-- TODO in the future update versions -->
<script type="text/javascript" src="js/jquery/jquery-1.7.min.js"></script>
<script type="text/javascript" src="js/jquery-ui/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="js/bootstrap/bootstrap-dropdown-fade.js"></script>
......@@ -122,7 +126,7 @@ $(function(){
<ul class="dropdown-menu">
<li>
<a id="addfiltercountry" href="#">Filter by country</a>
</li>
</li>
<!--<li>
<a id="addcolor" href="#">Color by</a>
</li>-->
......@@ -138,7 +142,7 @@ $(function(){
<li>
<a id="addfilterlaboratory" href="#">Filter by laboratory</a>
</li>
</ul>
</li>
<li>
......@@ -150,7 +154,7 @@ $(function(){
<li>
<a id="generate" href="#"> <strong>MAP</strong></a>
</li>
</ul>
<form id="search-form" class="js-search-form pull-right">
<span class="glass js-search-action"><i></i></span>
......@@ -176,9 +180,9 @@ $(function(){
<h2>Welcome to the complex systems community explorer</h2>
<br/>
<div class="row">
<div class="span8">
<div class="span8">
<p>
Map your own socio-semantic network or explore sub-communities using the <strong> interactive menu</strong> on the top of the webpage.
Map your own socio-semantic network or explore sub-communities using the <strong> interactive menu</strong> on the top of the webpage.
<br/>The integration of <a href="print_jobs_directory.php" target="blank">job openings</a> in maps aims at increasing the visibility
of new positions or new candidates. <small>[ <a href="jobmarket.html">more</a> ]</small>
</p>
......@@ -191,7 +195,7 @@ $(function(){
<button id="print2" class="btn btn-small btn-primary">
DIRECTORY
</button>
&nbsp;OR&nbsp;
&nbsp;OR&nbsp;
<button id="generate2" class="btn btn-small btn-primary">
MAP
</button>
......@@ -199,13 +203,13 @@ $(function(){
</p>
<br/><br/>
<i class="icon-user"></i> <strong>You cannot find yourself</strong> in the database, want update your data or keywords ? <a href="http://main.csregistry.org/Whoswhodata">Edit your profile</a>, the database is updated every 30 min.
<!--
<!--
<button id="register" class="btn btn-mini btn-info">
Edit you profile !
</button>
-->
-->
<br/><br/>
<br/>
<address>
<i class="icon-info-sign"></i> View our <a href="tips.html">tips</a> for best experience. This directory is <strong>open</strong> to everybody working in the field of Complex Systems science and Complexity science. Map and explore communities or generate a printable version of their directory.
......@@ -213,46 +217,46 @@ $(function(){
<br/>
<i class="icon-exclamation-sign"></i> You must have a <strong>recent browser</strong> (e.g. <img src=img/firefox_logo.png width=20> Firefox 10+ or <img src=img/chrome.png width=20> Chrome 17+) with a <strong>java plug-in</strong> see the maps. If this is not the case, you can still print the communities directories unless your browser is really outdated. In that case, you can still consult the <a href="http://main.csregistry.org/tiki-index.php?page=Complex%20Systems%20Scholars"> pure html version</a>.
<!-- <i class="icon-list-alt"></i> Personal data are given on a voluntary basis and people are responsible for the validity and integrity of their data. <br/>
<i class="icon-repeat"></i> Suggestions or comments ? <a href="http://moma.csregistry.org/feedback" target="BLANK">Please feedback.</a> <br/>
<i class="icon-user"></i><a href="http://main.csregistry.org/my+account" target="_BLANK"> Click here</a> to check your Complex Systems profile.-->
</address>
<br/><br/>
</div>
</div>
<!-- Second column -->
<div class="span5">
<p>Special features</p>
<div id="news-container">
<ul>
<li><a href="jobmarket.html">Job market
integration :</a> announce new jobs and find people looking for a job</li>
<p>Special features</p>
<div id="news-container">
<ul>
<li><a href="jobmarket.html">Job market
integration :</a> announce new jobs and find people looking for a job</li>
<li><a href="community_tags.html">Community tags:</a> Map any workgroup or event audience and get the associated directory.</li>
<li><a href="http://tina.iscpif.fr/explorerjs">Beta version of community explorer JS is coming !</a> If you have problems with java to generate the maps (ex. you use a mac), you can try the beta javascript version of the community explorer.</li>
</ul>
</div>
<br/><center>
<iframe src="http://player.vimeo.com/video/38383946" width="300" height="170" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></center>
<br/>
<br/>
</div>
</div>
</div>
<a href="https://twitter.com/intent/tweet?button_hashtag=communityexplorer&text=Map%20your%20%23network%2C%20explore%20the%20worldwide%20%23complexsystems%20%23community%20at%20all%20scales.%20%23dataviz" class="twitter-hashtag-button" data-url="http://communityexplorer.org">Tweet #communityexplorer</a>
<div class="fb-like" data-href="http://communityexplorer.org" data-send="true" data-layout="button_count" data-width="450" data-show-faces="true" data-font="arial"></div>
</div>
......@@ -271,4 +275,3 @@ integration :</a> announce new jobs and find people looking for a job</li>
</div>
</body>
</html>
print_directory.php
View file @ 220b8928
<?php
include ("comex_library.php");
include ("parametres.php");
include ("normalize.php");
include ("comex_library.php");
//include("../common/library/fonctions_php.php");
$meta = '<!DOCTYPE html>
......@@ -18,6 +18,7 @@ $meta = '<!DOCTYPE html>
<![endif]-->
<!-- Le styles -->
<link href="css/bootstrap_iscpif.css" rel="stylesheet">
<link href="css/bootstrap_directory.css" rel="stylesheet">
<link type="text/css" href="css/brownian-motion/jquery-ui-1.8.16.custom.css">
<link href="http://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css">
<script type="text/javascript" src="js/jquery/jquery-1.7.min.js"></script>
......
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