From 293b20963f2bbf0cfca1a146506d65d615b01c2c Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sat, 6 Oct 2012 00:19:12 -0700 Subject: starting to bootstrap the layout: navbar and tricks - changing the tricks-selector to a paginator and fixing the js for highlighting - adding a navbar using bootstrap, probably should use .wrap more instead of adding divs to the code --- include/cancelgame.php | 3 --- include/game.php | 14 +++++++------- include/output.php | 38 +++++++++++++++++++++++--------------- 3 files changed, 30 insertions(+), 25 deletions(-) (limited to 'include') diff --git a/include/cancelgame.php b/include/cancelgame.php index da6ffcc..df6e98d 100644 --- a/include/cancelgame.php +++ b/include/cancelgame.php @@ -24,9 +24,6 @@ if(!isset($HOST)) exit; -/* display the menu */ -output_status(); - /* you should only get here from a game page, so $me should be set */ if(!myisset("me")) { diff --git a/include/game.php b/include/game.php index d43699b..d07ff5b 100644 --- a/include/game.php +++ b/include/game.php @@ -367,7 +367,7 @@ switch($mystatus) case 'check': /* output sickness of other playes, in case they already selected and are sitting in front of the current player */ echo "\n\n"; /* end div trick, end li trick , end tricks*/ /* end displaying sickness */ @@ -381,7 +381,7 @@ switch($mystatus) $mygametype = DB_get_gametype_by_gameid($gameid); - echo "
  • Pre\n"; + echo "
  • Pre\n"; echo "
    • \n\n\n"; /* end div trick, end li trick , end ul tricks */ } /* end output pre-game trick */ @@ -411,19 +411,19 @@ switch($mystatus) { $trick=$r[0]; if($trick!=$lasttrick) - echo "
  • "._('Trick')." $trickNR
    • \n"; + echo "
  • "._('Trick')." $trickNR
    • \n"; else if($trick==$lasttrick) - echo "
  • "._('Trick')." $trickNR
    • \n"; + echo "
  • "._('Trick')." $trickNR
    • \n"; $trickNR++; } /* if game is over, also output link to Score tab */ if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' ) - echo "
  • "._('Score')."
    • \n"; + echo "
  • "._('Score')."
    • \n"; /* output previous/next buttons */ - echo '
    • \n"; - echo '
    • \n"; + echo '
  • '._('prev')."
    • \n"; + echo '
  • '._('next')."
    • \n"; echo "\n\n"; diff --git a/include/output.php b/include/output.php index 9094171..fa61c87 100644 --- a/include/output.php +++ b/include/output.php @@ -431,11 +431,6 @@ function output_header() -
    - '._('Welcome to E-Doko').' '; -?> -
    "; @@ -464,6 +459,7 @@ function output_footer() echo ''; echo ''; echo ''; + echo ''; echo ''; echo "\n"; @@ -472,7 +468,7 @@ function output_footer() return; } -function output_status() +function output_navbar() { global $defaulttimezone, $INDEX, $WIKI, $RSS; @@ -493,15 +489,27 @@ function output_status() $token = get_user_token($myid); /* logout info */ - echo "\n
    \n"; - echo $name,"\n"; - echo " | "._('mypage')."\n"; - echo " | "._('settings')."\n"; - echo " | "._('new game')."\n"; - echo " | "._('statistics')."\n"; - echo " | "._('wiki/bugs')."\n"; - echo " | "._('atom')."\n"; - echo " |    "._('logout')."\n"; + echo "\n
    \n"; + echo "
    \n"; + echo " E-DoKo\n"; + echo " \n"; + echo "
    \n"; echo "
    \n\n"; echo "
    "._('last login').": ".date("r",$unixtime)."
    \n\n"; -- cgit v1.2.3-18-g5258