Commit 61de935d authored by Vincent Calame's avatar Vincent Calame

Prise en compte du nouveau traitement de framework.css

parent e656fc62
......@@ -93,7 +93,7 @@ function initFramework() {
$framework = 'bootstrap3';
if (isset($_REQUEST['framework'])) {
switch($_REQUEST['framework']) {
case 'standalone':
case 'none':
case 'bootstrap3':
case 'bootstrap2':
$framework = $_REQUEST['framework'];
......@@ -127,7 +127,7 @@ function initEngineOptions() {
}
if (!array_key_exists("css-links", $engineArray)) {
$GLOBALS['scrutari']['engine']['css-links'] = array("static/scrutarijs/scrutarijs.css");
$GLOBALS['scrutari']['engine']['css-links'] = array();
}
if (!array_key_exists("js-links", $engineArray)) {
$GLOBALS['scrutari']['engine']['js-links'] = array();;
......
......@@ -169,6 +169,9 @@ function escapeQuote($value) {
<link rel="stylesheet" href="static/bootstrap/2.3.2/css/bootstrap-responsive.min.css">
<?php } ?>
<?php
$scrutarijsCssPath = "";
$frameworkCssPath = "";
$themeCssPath = "";
if ($GLOBALS['scrutari']['dev']) {
$devPath = $GLOBALS['scrutari']['conf']['dev-path'];
$list = file($devPath.'list.txt');
......@@ -179,10 +182,24 @@ if ($GLOBALS['scrutari']['dev']) {
echo '<script src="'.$devPath.'src/js/'.$jsfile.'"></script>'."\n";
}
}
echo '<script src="'.$devPath.'src/frameworks/'.$GLOBALS['scrutari']['framework'].'/init.js"></script>'."\n";
$scrutarijsCssPath = $devPath.'src/css/scrutarijs.css';
$frameworkCssPath = $devPath.'src/frameworks/'.$GLOBALS['scrutari']['framework'].'/resources/framework.css';
$themeCssPath = $devPath.'src/frameworks/'.$GLOBALS['scrutari']['framework'].'/resources/theme.css';
} else {
echo '<script src="static/scrutarijs/scrutarijs.js"></script>';
echo "\n".'<script src="static/scrutarijs/l10n/'.$GLOBALS['scrutari']['l10n'].'.js"></script>';
echo "\n".'<script src="static/scrutarijs/frameworks/'.$GLOBALS['scrutari']['framework'].'.js"></script>';
$scrutarijsCssPath = 'static/scrutarijs/scrutarijs.css';
$frameworkCssPath = 'static/scrutarijs/frameworks/'.$GLOBALS['scrutari']['framework'].'/framework.css';
$themeCssPath = 'static/scrutarijs/frameworks/'.$GLOBALS['scrutari']['framework'].'/theme.css';
}
echo '<link rel="stylesheet" href="'.$scrutarijsCssPath.'">'."\n";
if (file_exists($frameworkCssPath)) {
echo '<link rel="stylesheet" href="'.$frameworkCssPath.'">'."\n";
}
if (file_exists($themeCssPath)) {
echo '<link rel="stylesheet" href="'.$themeCssPath.'">'."\n";
}
$count = count($GLOBALS['scrutari']['engine']['js-links']);
for($i = 0; $i < $count; $i++) {
......@@ -190,13 +207,7 @@ for($i = 0; $i < $count; $i++) {
}
$count = count($GLOBALS['scrutari']['engine']['css-links']);
for($i = 0; $i < $count; $i++) {
$cssLink = $GLOBALS['scrutari']['engine']['css-links'][$i];
if ($GLOBALS['scrutari']['dev']) {
if ($cssLink == "static/scrutarijs/scrutarijs.css") {
$cssLink = $GLOBALS['scrutari']['conf']['dev-path']."src/css/scrutarijs.css";
}
}
echo '<link rel="stylesheet" href="'.$cssLink.'">'."\n";
echo '<link rel="stylesheet" href="'.$GLOBALS['scrutari']['engine']['css-links'][$i].'">'."\n";
}
?>
<script>
......@@ -248,7 +259,7 @@ for($i = 0; $i < $count; $i++) {
var scrutariConfig = new Scrutari.Config("<?php echo $GLOBALS['scrutari']['engine']['name'];?>","<?php echo $GLOBALS['scrutari']['engine']['url'];?>", "<?php echo $GLOBALS['scrutari']['lang'];?>", "<?php echo $GLOBALS['scrutari']['origin'];?>", {<?php
addEngineOption('fiche-fields', 'ficheFields');
?>"":""});
Scrutari.Client.init(scrutariConfig, "mainContainer", {<?php
Scrutari.Client.init(scrutariConfig, "scrutariClient", {<?php
if (array_key_exists('with-corpus', $GLOBALS['scrutari']['engine'])) {
echo "\n ".'withCorpus'.': '.booleanToString($GLOBALS['scrutari']['engine']['with-corpus']).',';
}
......@@ -281,6 +292,11 @@ for($i = 0; $i < $count; $i++) {
.scrutaristandalone-CurrentFicheBlock {
background-color: #e9e9e9;
}
.scrutaristandalone-Client {
max-width: 1170px;
margin: auto;
}
</style>
<?php
$customFile = "custom/".$GLOBALS['scrutari']['engine']['name'].".php";
......@@ -290,7 +306,16 @@ if (file_exists($customFile)) {
?>
</head>
<body>
<div class="container" id="mainContainer">
<?php
$scrutariClientClass = "scrutaristandalone-Client";
switch($GLOBALS['scrutari']['framework']) {
case 'bootstrap3':
case 'bootstrap2':
$scrutariClientClass = "container";
}
?>
<div class="<?php echo $scrutariClientClass; ?>" id="scrutariClient">
</div>
</body>
</html>
.scrutari-panel-Title > .scrutari-Disabled {
color: grey;
}
.scrutari-panel-Title > .scrutari-panel-Active {
color: green;
}
This diff is collapsed.
.scrutari-panel-Title > .scrutari-Disabled {
color: grey;
}
.scrutari-panel-Title > .scrutari-panel-Active {
color: green;
}
This diff is collapsed.
/*****************************************************
* .none-input
******************************************************/
.none-input-Container {
display: flex;
}
.none-input-Search {
width: 66%;
}
.none-input-Parameters {
width: 34%;
}
/*****************************************************
* .none-modal
******************************************************/
.none-modal-Content {
position: relative;
display: flex;
flex-direction: column;
background-color: #fff;
background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 0.3rem;
outline: 0;
}
@media (min-width: 576px) {
.none-modal-Dialog {
max-width: 500px;
margin: 30px auto;
}
}
.none-modal-Footer {
display: flex;
align-items: center;
justify-content: flex-end;
padding: 15px;
border-top: 1px solid #e9ecef;
}
.none-modal-Footer > :not(:first-child) {
margin-left: .25rem;
}
.none-modal-Footer > :not(:last-child) {
margin-right: .25rem;
}
.none-modal-Header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 15px;
border-bottom: 1px solid #e9ecef;
}
.none-modal-Title {
margin-bottom: 0;
line-height: 1.5;
font-size: 1.25rem;
}
/*****************************************************
* .none-panel
******************************************************/
.none-panel-Columns {
display: flex;
}
.none-panel-Columns > div {
width: 25%;
}
/*****************************************************
* .none-result
******************************************************/
.none-result-Container {
display: flex;
}
.none-result-FicheDisplay {
width: 66%;
}
.none-result-Sidebar {
width: 34%;
}
/*****************************************************
* .overlay
******************************************************/
.overlay-Blocker {
position: fixed;
top: 0; right: 0; bottom: 0; left: 0;
width: 100%; height: 100%;
overflow: hidden;
z-index: 10000;
padding: 20px;
box-sizing: border-box;
background-color: rgba(0,0,0, 0.75);
text-align: center;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.overlay-Dialog {
position: relative;
box-sizing: border-box;
background: #fff;
border-radius: 8px;
box-shadow: 0 0 10px #000;
text-align: left;
max-width: 700px;
}
.overlay-Waiting {
cursor: wait;
}
.overlay-Waiting input[type="submit"] {
cursor: wait;
}
.overlay-panel-Header, .overlay-panel-Content, .overlay-panel-Footer {
display: table-row;
}
.overlay-panel-Header > div {
border-top-left-radius: 8px;
border-top-right-radius: 8px;
text-align: left;
font-weight: bold;
min-height: 10px;
padding-top: 20px;
padding-bottom: 20px;
padding-left: 10px;
padding-right: 10px;
border-bottom: 1px solid #ddd;
}
.overlay-panel-Content > div {
padding: 10px 20px;
text-align: left;
font-size: 0.9em;
min-width: 20vw;
max-width: 90vw;
max-height: 70vh;
overflow: auto;
background-color: #fff;
}
.overlay-panel-Content > div p {
margin-left: 0;
}
.overlay-panel-Footer > div {
clear: both;
padding-bottom: 8px;
background-color: #fff;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
.overlay-panel-Footer > div > div {
border-top: 1px solid #ddd;
text-align: right;
padding-top: 8px;
padding-left: 10px;
padding-right: 10px;
}
.overlay-panel-Footer button {
display: inline-block;
font-weight: 400;
text-align: center;
white-space: nowrap;
vertical-align: middle;
user-select: none;
border: 1px solid transparent;
padding: .5em .75em;
line-height: 1.25;
border-radius: .25em;
transition: all .15s ease-in-out;
}
.overlay-panel-Footer button:hover {
cursor: pointer;
}
.overlay-Waiting .overlay-panel-Footer button[type="submit"]:hover:disabled {
cursor: wait;
}
.overlay-button-Close {
position: absolute;
top: -12.5px;
right: -12.5px;
display: block;
width: 30px;
height: 30px;
border-radius: 15px;
border: none;
font-size: 20px;
background-color: #000;
color: #fff;
}
.overlay-button-Close:hover {
background-color: #61adff;
}
This diff is collapsed.
/*****************************************************
* .scrutari-panel
******************************************************/
.scrutari-panel-Div {
border-width: 1px;
border-style: solid;
border-color: #ddd;
border-radius: 3px;
}
.scrutari-panel-Heading {
border-bottom-width: 1px;
border-bottom-style: solid;
border-bottom-color: #ddd;
background-color: #f5f5f5;
}
/*****************************************************
* .overlay-pnael
******************************************************/
.overlay-panel-Header > div {
color: #fff;
background-color: #007bff;
border-bottom: 1px solid #007bff;
}
.overlay-panel-Footer > div > div {
border-color: #007bff;
}
.overlay-panel-Footer button {
color: #fff;
background-color: #007bff;
border-color: #007bff;
}
.overlay-panel-Footer button:hover {
cursor: pointer;
}
.overlay-Waiting .overlay-panel-Footer button[type="submit"]:hover:disabled {
background-color: #61adff;
}
/*****************************************************
* .scrutari
******************************************************/
.scrutari-Hidden {
display: none !important;
display: none !important;
}
.scrutari-Disabled,
.scrutari-panel-Title > .scrutari-Disabled {
.scrutari-Disabled {
color: grey;
}
......@@ -17,6 +20,13 @@ margin-bottom: 0;
background-color: #e9e9e9;
}
.scrutari-On {
}
/*****************************************************
* .scrutari-area
******************************************************/
.scrutari-area-Parameters {
margin-bottom: 25px;
}
......@@ -33,12 +43,46 @@ margin-bottom: 15px;
.scrutari-area-Title {
}
/*****************************************************
* .scrutari-button
******************************************************/
.scrutari-button-Parameters {
width: 100%;
padding-top: 4px;
padding-bottom: 4px;
}
.scrutari-button-Help {
}
/*****************************************************
* .scrutari-category
******************************************************/
.scrutari-category-Tab {
display: inline-block;
padding-left: 4px;
padding-right: 4px;
cursor: pointer;
}
.scrutari-category-Tab:hover {
background-color: #e9e9e9;
}
.scrutari-category-Tab.scrutari-On {
cursor: auto;
background-color: #e9e9e9;
}
/*****************************************************
* .scrutari-export
******************************************************/
.scrutari-export-Atom {
background-image: url("images/export_atom.png");
min-height: 17px;
......@@ -53,6 +97,11 @@ padding-left: 18px;
background-repeat: no-repeat;
}
/*****************************************************
* .scrutari-fiche
******************************************************/
.scrutari-fiche-AttrBlocks {
margin-left: 30px;
font-size: 1.0em;
......@@ -119,19 +168,19 @@ max-width: 100px;
}
.scrutari-fiche-ThumbnailIcon {
display: block;
position: absolute;
top: 0;
left: 0;
border-right-color: #fff;
border-right-style: solid;
border-right-width: 3px;
border-bottom-color: #fff;
border-bottom-style: solid;
border-bottom-width: 2px;
background-color: #fff;
border-bottom-right-radius: 2px;
z-index: 100;
display: block;
position: absolute;
top: 0;
left: 0;
border-right-color: #fff;
border-right-style: solid;
border-right-width: 3px;
border-bottom-color: #fff;
border-bottom-style: solid;
border-bottom-width: 2px;
background-color: #fff;
border-bottom-right-radius: 2px;
z-index: 100;
}
.scrutari-fiche-Titre {
......@@ -148,6 +197,11 @@ font-style: italic;
margin-left: 15px;
}
/*****************************************************
* .scrutari-history
******************************************************/
.scrutari-history-Active {
background-color: #e9e9e9;
}
......@@ -164,6 +218,11 @@ margin-left: 6px;
word-wrap: break-word;
}
/*****************************************************
* .scrutari-icon
******************************************************/
.scrutari-icon-Loader {
background-image: url("images/ajax-loader.gif");
position: relative;
......@@ -181,6 +240,11 @@ width: 32px;
height: 32px;
}
/*****************************************************
* .scrutari-input
******************************************************/
.scrutari-input-Text {
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
......@@ -192,6 +256,11 @@ border-top-color: #a0a0a0;
border-left-color: #a0a0a0;
}
/*****************************************************
* .scrutari-label
******************************************************/
.scrutari-label-Attribute {
font-style: italic;
}
......@@ -205,6 +274,11 @@ font-style: italic;
font-variant: normal;
}
/*****************************************************
* .scrutari-links
******************************************************/
.scrutari-links-Title {
margin-top: 30px;
margin-bottom: 10px;
......@@ -217,12 +291,44 @@ text-align: center;
margin-top: 20px;
}
/*****************************************************
* .scrutari-modal
******************************************************/
.scrutari-modal-Title {
font-size: 1.3em;
}
.scrutari-panel-Active,
.scrutari-panel-Title > .scrutari-panel-Active {
/*****************************************************
* .scrutari-pagination
******************************************************/
.scrutari-pagination-List {
margin-top: 15px;
margin-bottom: 15px;
}
.scrutari-pagination-Tab, .scrutari-pagination-Current, .scrutari-pagination-Disabled {
display: inline-block;
padding-left: 4px;
padding-right: 4px;
}
.scrutari-pagination-Tab {
cursor: pointer;
}
.scrutari-pagination-Current, .scrutari-pagination-Tab:hover {
background-color: #e9e9e9;
}
/*****************************************************
* .scrutari-panel
******************************************************/
.scrutari-panel-Active {
color: green;
}
......@@ -242,16 +348,20 @@ vertical-align: baseline;
.scrutari-panel-Title {
font-size: 1.0em;
line-height: 1.1;
cursor: pointer;
}
.scrutari-panel-WithTools {
padding-top : 3px;
}
.scrutari-result-Pagination {
margin-top: 15px;
margin-bottom: 15px;
}
/*****************************************************
* .scrutari-stats
******************************************************/
.scrutari-stats-Abbr {
text-decoration: none;
......@@ -271,6 +381,11 @@ color: green;
color: red;
}
/*****************************************************
* .scrutari-title
******************************************************/
.scrutari-title-Main {
font-size: 1.3em;
margin-top: 20px;
......
This diff is collapsed.
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