Skip to content

Commit

Permalink
spostato in dbtable la definizione dell 'id
Browse files Browse the repository at this point in the history
aggiornato bootstrap
rimossi tutti gli stily e spostati in css
rimosse tutti gli script e utilizzo dei dati html5
pagina classifica responses
altra pulizia generale
  • Loading branch information
fiste788 committed Dec 9, 2012
1 parent 2213c79 commit e7df63e
Show file tree
Hide file tree
Showing 82 changed files with 1,278 additions and 1,086 deletions.
8 changes: 7 additions & 1 deletion .htaccess
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AddHandler application/x-httpd-php53 .php .php5 .php4 .php3
# AddHandler application/x-httpd-php54 .php .php5 .php4 .php3
# Apache configuration file
# httpd.apache.org/docs/2.2/mod/quickreference.html

Expand Down Expand Up @@ -77,6 +77,12 @@
</IfModule>


# Keep-alive

<IfModule mod_headers.c>
Header set Connection keep-alive
</IfModule>

# ----------------------------------------------------------------------
# Proper MIME type for all files
# ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ajax/probabiliFormazioni.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
require_once('../config/config.inc.php');
require_once(INCDIR . 'db.inc.php');
require_once(INCDBDIR . 'db.inc.php');
require_once(INCDIR . 'fileSystem.inc.php');

$url = "http://www.gazzetta.it/Calcio/prob_form/";
Expand Down
8 changes: 7 additions & 1 deletion code/formazione.code.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@
$giornate[$i] = $i;

$quickLinks->set('giornata',$giornate,'Giornata ');
$modulo = ($formazione != FALSE) ? explode('-',$formazione->modulo) : NULL;
if($formazione != FALSE) {
$modulo = explode('-',$formazione->modulo);
$modulo = array_combine(array("P","D","C","A"), array_map('intval', $modulo));
}
else
$modulo = NULL;
if($formazione != FALSE)
$contentTpl->assign('formazione',$formazione);

Expand All @@ -37,6 +42,7 @@
$titolari[] = $schieramento->idGiocatore;
else
$panchinari[] = $schieramento->idGiocatore;

$contentTpl->assign('titolari', $titolari);
$contentTpl->assign('panchinari', $panchinari);
$contentTpl->assign('giocatori',$giocatori);
Expand Down
1 change: 0 additions & 1 deletion code/home.code.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
}
}

FirePHP::getInstance()->log(Articolo::getByIds(array(1,2,3)));
$articoli = Articolo::getLastArticoli(1);
if($articoli != FALSE)
foreach ($articoli as $key => $val)
Expand Down
2 changes: 1 addition & 1 deletion css/less/bootstrap/accordion.less
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
.accordion-group {
margin-bottom: 2px;
border: 1px solid #e5e5e5;
.border-radius(4px);
.border-radius(@baseBorderRadius);
}
.accordion-heading {
border-bottom: 0;
Expand Down
16 changes: 15 additions & 1 deletion css/less/bootstrap/alerts.less
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
text-shadow: 0 1px 0 rgba(255,255,255,.5);
background-color: @warningBackground;
border: 1px solid @warningBorder;
.border-radius(4px);
.border-radius(@baseBorderRadius);
}
.alert,
.alert h4 {
// Specified for the h4 to prevent conflicts of changing @headingsColor
color: @warningText;
}
.alert h4 {
Expand All @@ -36,17 +40,27 @@
border-color: @successBorder;
color: @successText;
}
.alert-success h4 {
color: @successText;
}
.alert-danger,
.alert-error {
background-color: @errorBackground;
border-color: @errorBorder;
color: @errorText;
}
.alert-danger h4,
.alert-error h4 {
color: @errorText;
}
.alert-info {
background-color: @infoBackground;
border-color: @infoBorder;
color: @infoText;
}
.alert-info h4 {
color: @infoText;
}


// Block alerts
Expand Down
15 changes: 8 additions & 7 deletions css/less/bootstrap/bootstrap.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v2.1.1
* Bootstrap v2.2.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down Expand Up @@ -31,7 +31,7 @@
@import "dropdowns.less";
@import "wells.less";
@import "component-animations.less";
@import "close.less";
//@import "close.less";

// Components: Buttons & Alerts
@import "buttons.less";
Expand All @@ -46,17 +46,18 @@
//@import "pager.less";

// Components: Popovers
@import "modals.less";
@import "tooltip.less";
@import "popovers.less";
//@import "modals.less";
//@import "tooltip.less";
//@import "popovers.less";

// Components: Misc
@import "thumbnails.less";
//@import "thumbnails.less";
//@import "media.less";
@import "labels-badges.less";
@import "progress-bars.less";
//@import "accordion.less";
//@import "carousel.less";
@import "hero-unit.less";
//@import "hero-unit.less";

// Utility classes
@import "utilities.less"; // Has to be last to override when necessary
14 changes: 7 additions & 7 deletions css/less/bootstrap/breadcrumbs.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
margin: 0 0 @baseLineHeight;
list-style: none;
background-color: #f5f5f5;
.border-radius(4px);
li {
.border-radius(@baseBorderRadius);
> li {
display: inline-block;
.ie7-inline-block();
text-shadow: 0 1px 0 @white;
> .divider {
padding: 0 5px;
color: #ccc;
}
}
.divider {
padding: 0 5px;
color: #ccc;
}
.active {
> .active {
color: @grayLight;
}
}
82 changes: 32 additions & 50 deletions css/less/bootstrap/button-groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Make the div behave like a button
.btn-group {
position: relative;
display: inline-block;
.ie7-inline-block();
font-size: 0; // remove as part 1 of font-size inline-block hack
vertical-align: middle; // match .btn alignment given font-size hack above
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
Expand All @@ -22,13 +24,9 @@
font-size: 0; // Hack to remove whitespace that results from using inline-block
margin-top: @baseLineHeight / 2;
margin-bottom: @baseLineHeight / 2;
.btn-group {
display: inline-block;
.ie7-inline-block();
}
.btn + .btn,
.btn-group + .btn,
.btn + .btn-group {
> .btn + .btn,
> .btn-group + .btn,
> .btn + .btn-group {
margin-left: 5px;
}
}
Expand All @@ -42,59 +40,44 @@
margin-left: -1px;
}
.btn-group > .btn,
.btn-group > .dropdown-menu {
.btn-group > .dropdown-menu,
.btn-group > .popover {
font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
}

// Reset fonts for other sizes
.btn-group > .btn-mini {
font-size: 11px;
font-size: @fontSizeMini;
}
.btn-group > .btn-small {
font-size: 12px;
font-size: @fontSizeSmall;
}
.btn-group > .btn-large {
font-size: 16px;
font-size: @fontSizeLarge;
}

// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
.btn-group > .btn:first-child {
margin-left: 0;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
border-top-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
.border-top-left-radius(@baseBorderRadius);
.border-bottom-left-radius(@baseBorderRadius);
}
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
.btn-group > .btn:last-child,
.btn-group > .dropdown-toggle {
-webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
border-top-right-radius: 4px;
-webkit-border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px;
.border-top-right-radius(@baseBorderRadius);
.border-bottom-right-radius(@baseBorderRadius);
}
// Reset corners for large buttons
.btn-group > .btn.large:first-child {
margin-left: 0;
-webkit-border-top-left-radius: 6px;
-moz-border-radius-topleft: 6px;
border-top-left-radius: 6px;
-webkit-border-bottom-left-radius: 6px;
-moz-border-radius-bottomleft: 6px;
border-bottom-left-radius: 6px;
.border-top-left-radius(@borderRadiusLarge);
.border-bottom-left-radius(@borderRadiusLarge);
}
.btn-group > .btn.large:last-child,
.btn-group > .large.dropdown-toggle {
-webkit-border-top-right-radius: 6px;
-moz-border-radius-topright: 6px;
border-top-right-radius: 6px;
-webkit-border-bottom-right-radius: 6px;
-moz-border-radius-bottomright: 6px;
border-bottom-right-radius: 6px;
.border-top-right-radius(@borderRadiusLarge);
.border-bottom-right-radius(@borderRadiusLarge);
}

// On hover/focus/active, bring the proper btn to front
Expand All @@ -120,7 +103,7 @@
.btn-group > .btn + .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
.box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
.box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
*padding-top: 5px;
*padding-bottom: 5px;
}
Expand All @@ -147,7 +130,7 @@
// Remove the gradient and set the same inset shadow as the :active state
.dropdown-toggle {
background-image: none;
.box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
}

// Keep the hover's background when dropdown is open
Expand Down Expand Up @@ -193,8 +176,7 @@
}
// Upside down carets for .dropup
.dropup .btn-large .caret {
border-bottom: 5px solid @black;
border-top: 0;
border-bottom-width: 5px;
}


Expand All @@ -221,25 +203,25 @@
display: inline-block; // makes buttons only take up the width they need
.ie7-inline-block();
}
.btn-group-vertical .btn {
.btn-group-vertical > .btn {
display: block;
float: none;
width: 100%;
max-width: 100%;
.border-radius(0);
}
.btn-group-vertical .btn + .btn {
.btn-group-vertical > .btn + .btn {
margin-left: 0;
margin-top: -1px;
}
.btn-group-vertical .btn:first-child {
.border-radius(4px 4px 0 0);
.btn-group-vertical > .btn:first-child {
.border-radius(@baseBorderRadius @baseBorderRadius 0 0);
}
.btn-group-vertical .btn:last-child {
.border-radius(0 0 4px 4px);
.btn-group-vertical > .btn:last-child {
.border-radius(0 0 @baseBorderRadius @baseBorderRadius);
}
.btn-group-vertical .btn-large:first-child {
.border-radius(6px 6px 0 0);
.btn-group-vertical > .btn-large:first-child {
.border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
}
.btn-group-vertical .btn-large:last-child {
.border-radius(0 0 6px 6px);
.btn-group-vertical > .btn-large:last-child {
.border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
}
Loading

0 comments on commit e7df63e

Please sign in to comment.