home_old.php images/bluebutton.gif includes/status.php integration/fsock.php integration/github.php integration/xml.php js/round.js uploads/index_08.gif-1233433388.gif @@ -3,18 +3,19 @@ include('includes/main.php'); include('config.php'); include('includes/db.php'); - +include('includes/status.php'); include('includes/bug.php'); include('includes/user.php'); $mydb = new Database($db['host'], $db['user'], $db['pass'], $db['db'], '', 20); $mydb->NewConnection(); $main = new Main($mydb); $user = new User(); +$s = new Status($mydb, $user); //print_r($_POST); // test $userName = $_POST["username"]; $passWord = $_POST["password"]; - +$_uid = $mydb->first("SELECT `id` FROM `users` WHERE `username`='$userName'"); $adminCheck = $mydb->first("SELECT `acl` FROM `users` WHERE `username`='$userName' AND `password`='".md5($passWord)."';"); if($adminCheck === "0") $isadmin = 1; @@ -54,6 +55,10 @@ if(isset($_POST["closeticket"]) && $isadmin == 1){ $mydb->query_update('list', array('status' => 0, 'finished' => time() ), "id='$closeticket'"); echo "Ticket Closed"; + $projectID = $mydb->first("SELECT `project` FROM list WHERE `id`='".$_POST['tickid']."'"); + $s->n($_POST["tickid"], $_uid, 'closed', $projectID); + + // send emails to author $authorID = $mydb->clean($_POST["by"], '', ''); // echo "UID: $authorID"; ajax.php @@ -18,7 +18,7 @@ h1, h2, h3 { margin:0; padding:0;} #bbtop { font-size: 10px; height: 71px; } #logo { font-size: 160%; color: white; padding: 10px; } #bbbot { background-color: #266A9B; } -#bbbot a { margin-left: 25px; margin-top: 10px; color: #e8e8e8; font-size: 11px; font-weight: bold; text-decoration: none; } +#bbbot a { margin-left: 25px; margin-top: -5px; margin-bottom: 5px; color: #e8e8e8; font-size: 90%; font-weight: bold; text-decoration: none; } #bbotnav { height: 35px; } #bbbot a:hover { color: #69B7DC; } #bbtop input { font-size: 11px; } @@ -206,8 +206,19 @@ label { font-size: 12px; color: #555555; font-weight: bold; } #sidenav h3 { font-size: 90%; border-bottom: 1px solid #ababab; } #sidenav a { font-size: 80%; color: #555555; display: block; padding-top: 5px; padding-bottom: 5px; padding-left: 5px; width: 250px; } #sidenav a:hover { background-color: #cdcdcd; text-decoration: none; } +#sidenav small { font-size: 50%; padding-left: 15px;} +.openticks { padding-left: 10px; padding-right: 15px; color: white; background-color: #5A9ECF; width: 40px; margin-right: 10px; } +.openticks * { float: left; } +#status { background-color: white; margin-top: 15px; } +#status h3 { font-size: 100%; } -.openticks { padding-left: 10px; padding-right: 15px; color: white; background-image: url(images/bluebutton.gif); background-repeat: no-repeat; margin-right: 10px; } +#github { overflow: auto; height: 350px; } -#status { background-color: white; margin-top: 15px; } -#status h3 { font-size: 100%; } \ No newline at end of file +.update { font-size: 90%; color: #888888; margin-left: 40px; border-bottom: 1px solid #dfdfdf; margin-right: 50px; margin-top: 10px; margin-bottom: 4px; height: 20px; } + +.update #statustext { float: right; } +.update a { color: #5A9ECF; } +.update a:hover { color: #266A9B; text-decoration: none;} + +#statustype { margin-top: -15px; float: right; background-color: #5A9ECF; width: 70px; color: white; font-size: 80%; text-align: center; text-transform: uppercase; } +#statususer { color: #222222; } bug.css @@ -470,6 +470,7 @@ class View extends Bugs { } function reply($bugid){ + ?> <form name="" method="POST" action="" enctype="multipart/form-data"> <input type="hidden" name="MAX_FILE_SIZE" value="2000000"> @@ -509,8 +510,7 @@ class View extends Bugs { </td> </tr> </table> -</td></tr> -</table> + </form> <?php @@ -556,7 +556,7 @@ class View extends Bugs { <td align="center" style="background-image: url('<?php echo BBPATH; ?>/images/bar.gif'); background-position: -<?php echo $backgroundpos;?>px 0px; background-repeat: no-repeat; color: black;"> <?php echo $finished;?>/<?php echo $unfinished;?> </td> - <tr> + </tr> </table> </div> <div style="padding-top: 20px;"></div> includes/bug.php @@ -12,7 +12,7 @@ function Main($db){ $this->db=$db; $this->user = new User(); - $this->s = new Status($db); + $this->s = new Status($db, $this->user); } function headStart(){ @@ -37,11 +37,15 @@ <script type="text/javascript" src="js/jquery-1.2.6.min.js"></script> <script type="text/javascript" src="js/jq-sort.js"></script> <script type="text/javascript" src="js/init.js"></script> - + <script type="text/javascript" src="js/round.js"></script> <script>$(document).ready(function(){$('#ProjTab').hide(); $("#ProjToggle").toggle(function () {$('#ProjTab').fadeIn();},function () {$('#ProjTab').hide();}); + + $(".statustype").corner('5px'); + $(".openticks").corner('5px'); + $("#status").corner(); }); </script> </head> @@ -188,10 +192,24 @@ $("#ProjToggle").toggle(function () {$('#ProjTab').fadeIn();},function () {$('#P $tpr = $this->db->query("SELECT * FROM projects ORDER BY `name` ASC"); while($r = mysql_fetch_array($tpr)){ $open = $this->db->first("SELECT count(*) FROM list WHERE `status`='1' AND `parent`='0' AND `project`='".$r['id']."';"); - echo '<a href="?specialrefiner='.$r['id'].'"><span class="openticks" id="open'.$r['id'].'"> '.$open.' </span> '.$r['name'].'</a>'; + echo '<a href="?specialrefiner='.$r['id'].'"><span class="openticks" id="open'.$r['id'].'">'.$open.' </span> '.$r['name'].'</a>'; ?> <?php } + if(isset($_GET['cmd']) && $_GET['cmd'] == 'view'){ + $bugid = $this->db->clean($_GET['id'], '', ''); + $projid = $this->db->first("SELECT `project` FROM list WHERE `id`='$bugid'"); + $proj_git = $this->db->first("SELECT `github` FROM projects WHERE `id`='".$projid."'"); + ?><br> + <h3>GitHub Commits</h3> + <script type="text/javascript">$(function(){ + $('#github').load("/integration/github.php?url=<?php echo $proj_git;?>"); + }); + </script> + <div id='github'></div> + <?php + } + } includes/main.php @@ -52,9 +52,10 @@ 'type' => $type, 'started' => time(), 'finished' => '', 'due' => '', 'assigned' => '', 'attachment' => $target.$file_name); $this->db->query_insert('list', $bugData); $this->message("<center><h3>Report submitted.</h3></center>"); - $LASTID = $this->db->lastID(); - - $this->s->n("<a href='?cmd=view&id=$LASTID'>\"{$_POST['subject']}\"</a> was created by "); + $LASTID = $this->db->lastID(); + if($type == 0) $type = "bug"; + if($type == 1) $type = "feature"; + $this->s->n($LASTID, $reportedby, $type, $_POST['project']); //echo $lastID; // send emails to administrators $this->db->query("SELECT * FROM users WHERE `acl`='0'"); @@ -125,6 +126,7 @@ <tr> <td><input type="file" name="attachment" /></td> </tr> + <tr> <td>Shortcuts: <br> <b>[CE]ID[/CE]:</b> Link to this project's ClientExec.<br> submit.php @@ -45,7 +45,8 @@ if(isset($_POST["submitReport"])){ 'type' => 0, 'started' => time(), 'finished' => '', 'due' => '', 'assigned' => '', 'attachment' => $target.$file_name); $this->db->query_insert('list', $bugData); $this->message("<center><h3>Reply added.</h3></center>"); - + $this->s->n($bugid, $reportedby, 'update', $this->db->first("SELECT `project` FROM list WHERE `id`='$bugid'", 0, 0)); + } ?> <?php view.php 393ddd657594647ed8c2ef20d97753e73b4a8b2f root josh@bluescripts.net http://github.com/bluescripts/bbug/commit/02ff379d9700b1942071331d5718555d3e3ab081 02ff379d9700b1942071331d5718555d3e3ab081 2009-03-12T08:28:50-07:00 2009-03-12T08:28:50-07:00 need to add private repo auth 538235adfb5f41de2067c9026b0af5ce1991b2d6 root josh@bluescripts.net