Work/fdn2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

Browse Source
This commit is contained in:
Lorenzo Giacomelli
2016-03-01 14:12:16 +01:00
parent 460efea091 b32ee42ea4
commit 4f0e0b78d2
8 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oth/img/UnderConstruction.xcf
BIN
View File
Binary file not shown.
public/admin/editBanner.php
+1 -1
View File
@@ -164,7 +164,7 @@ try{
<div style=""><span class="label">Data fine:</span><input type="text" id="datepickerEnd" name="dateEnd" value="<?php echo ($edit)? date("d-m-Y",$banner->end->sec):date("d-m-Y");?>"></div>
</form>
<div style="margin:15px 5px;">
<div class="formBtns">
<a href="#" id="submit" >Invia</a>
<a href="#" id="back" >Back</a>
<!-- <a href="#" id="delete">Delete</a> -->
public/admin/homeNotizie.php
+1 -1
View File
@@ -96,7 +96,7 @@ try{
?>
<div class="notiziaAcceptance">
Questa notizia è ancora in stato di valutazione. Si desidera cambiare lo stato della notizia?
<div>
<div class="buttons">
<a class="green" href="javascript:void();">Accettata</a>
<a class="red" href="javascript:void();">Respinta</a>
<script type="text/javascript">
public/admin/listAccess.php
+4 -4
View File
@@ -20,11 +20,11 @@ MenuGenerator::generateMenu();
HTMLHelper::generateAdminHead();
$columns = array(
array("label"=>"Nome","data"=>"related.nome"),
array("label"=>"Cognome","data"=>"related.cognome"),
array("label"=>"Nome","data"=>"related.fullName"),
array("label"=>"Email","data"=>"related.email"),
array("label"=>"Tipo","data"=>"related.type","sort"=>"asc"),
array("label"=>"Data","data"=>"date","sort"=>"desc")
array("label"=>"IP","data"=>"ip"),
array("label"=>"Data","data"=>"date","sort"=>"desc"),
array("label"=>"Tipo","data"=>"related.type","sort"=>"asc")
);
$buttons = array();
public/admin/tablesBackends/accessListTableBackend.php
+2 -2
View File
@@ -13,12 +13,12 @@ $exposedFields = array(
$ele = GlobalVariables::get("dao")->getFirst($data->class,array("id"=>$data->id));
$rval = new stdClass();
$rval->type = str_replace("Model", "", get_class($ele));
$rval->nome = $ele->nome;
$rval->cognome = $ele->cognome;
$rval->fullName = $ele->nome." ".$ele->cognome;
$rval->email = $ele->email;
return $rval;
},
"date"=>null,
"ip"=>null,
"id"=>null
);
public/images/UnderConstruction.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

public/style/admin.css
+3 -3
View File
@@ -69,9 +69,9 @@ form > div{margin:5px 0;}
.notiziaMenu ul li{margin: 10px 0px;display: block; clear:both;}
div.notiziaAcceptance{text-align: center; background-color: #ffd677; padding: 20px; border: 1px solid grey; border-radius: 10px;}
div.notiziaAcceptance > a{text-decoration:none; color:rgb(51, 102, 255); font-weight:bold; margin-right:5px; padding:5px; display:inline-block;}
div.notiziaAcceptance > a.green:hover{background-color:#7EFF83;}
div.notiziaAcceptance > a.red:hover{background-color:#FF8DA6;}
div.notiziaAcceptance > .buttons a{text-decoration:none; color:rgb(51, 102, 255); font-weight:bold; margin-right:5px; padding:5px; display:inline-block;}
div.notiziaAcceptance > .buttons a.green:hover{background-color:#7EFF83;}
div.notiziaAcceptance > .buttons a.red:hover{background-color:#FF8DA6;}
/*
__ __ _ _
| \/ | ___ __| (_) __ _
public/underConstruction.php
+12
View File
@@ -0,0 +1,12 @@
<?php
/*
Author: Riccardo Di Dato
Creation Date: 01/mar/2016
*/
?>
<div style="text-align:center;">
<img src="images/UnderConstruction.png">
</div>