Projects / Chaw

diff --git a/views/commits/branch.ctp b/views/commits/branch.ctp old mode 100755 new mode 100644 diff --git a/views/commits/index.ctp b/views/commits/index.ctp old mode 100755 new mode 100644 diff --git a/views/commits/logs.ctp b/views/commits/logs.ctp old mode 100755 new mode 100644 diff --git a/views/commits/view.ctp b/views/commits/view.ctp old mode 100755 new mode 100644 diff --git a/views/dashboard/admin_index.ctp b/views/dashboard/admin_index.ctp old mode 100755 new mode 100644 diff --git a/views/dashboard/index.ctp b/views/dashboard/index.ctp old mode 100755 new mode 100644 diff --git a/views/elements/current_projects.ctp b/views/elements/current_projects.ctp old mode 100755 new mode 100644 diff --git a/views/elements/current_user.ctp b/views/elements/current_user.ctp old mode 100755 new mode 100644 diff --git a/views/elements/email/html/default.ctp b/views/elements/email/html/default.ctp old mode 100755 new mode 100644 diff --git a/views/elements/email/text/default.ctp b/views/elements/email/text/default.ctp old mode 100755 new mode 100644 diff --git a/views/elements/markdown_help.ctp b/views/elements/markdown_help.ctp old mode 100755 new mode 100644 diff --git a/views/elements/project_details.ctp b/views/elements/project_details.ctp old mode 100755 new mode 100644 diff --git a/views/elements/recent/comments.ctp b/views/elements/recent/comments.ctp old mode 100755 new mode 100644 diff --git a/views/elements/recent/commits.ctp b/views/elements/recent/commits.ctp old mode 100755 new mode 100644 diff --git a/views/elements/recent/tickets.ctp b/views/elements/recent/tickets.ctp old mode 100755 new mode 100644 diff --git a/views/elements/recent/wiki.ctp b/views/elements/recent/wiki.ctp old mode 100755 new mode 100644 diff --git a/views/elements/timeline/comment.ctp b/views/elements/timeline/comment.ctp index 3f73bb5..03147a6 100644 --- a/views/elements/timeline/comment.ctp +++ b/views/elements/timeline/comment.ctp @@ -14,7 +14,7 @@ echo "<span class=\"small\"><strong>{$data['Comment']['reason']}</strong></span>"; endif; ?> - <p> + </p> <div class="body"> <!-- diff --git a/views/elements/timeline/commit.ctp b/views/elements/timeline/commit.ctp index 46dedec..2d83bf7 100644 --- a/views/elements/timeline/commit.ctp +++ b/views/elements/timeline/commit.ctp @@ -11,7 +11,7 @@ echo date("H:i", strtotime($data['Timeline']['created'])); ?> </span> - <p> + </p> <div class="body"> <!-- diff --git a/views/elements/timeline/ticket.ctp b/views/elements/timeline/ticket.ctp index 565fb4f..4858702 100644 --- a/views/elements/timeline/ticket.ctp +++ b/views/elements/timeline/ticket.ctp @@ -9,7 +9,7 @@ echo date("H:i", strtotime($data['Ticket']['created'])); ?> </span> - <p> + </p> <div class="body"> <!-- @@ -43,10 +43,10 @@ ?> </p> - <p class="description"><?php + <p class="description"><?php echo $text->truncate($data['Ticket']['description'], 80, array( 'exact' => true, 'html' => false - )); + )); ?></p> </div> diff --git a/views/elements/timeline/wiki.ctp b/views/elements/timeline/wiki.ctp index a72144a..bf9ea85 100644 --- a/views/elements/timeline/wiki.ctp +++ b/views/elements/timeline/wiki.ctp @@ -11,7 +11,7 @@ echo date("H:i", strtotime($data['Wiki']['created'])); ?> </span> - <p> + </p> <div class="body"> <!-- diff --git a/views/layouts/ajax.ctp b/views/layouts/ajax.ctp old mode 100755 new mode 100644 diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp old mode 100755 new mode 100644 diff --git a/views/layouts/email/html/default.ctp b/views/layouts/email/html/default.ctp old mode 100755 new mode 100644 diff --git a/views/layouts/email/text/default.ctp b/views/layouts/email/text/default.ctp old mode 100755 new mode 100644 diff --git a/views/layouts/flash.ctp b/views/layouts/flash.ctp old mode 100755 new mode 100644 diff --git a/views/layouts/js/default.ctp b/views/layouts/js/default.ctp old mode 100755 new mode 100644 diff --git a/views/layouts/rss/default.ctp b/views/layouts/rss/default.ctp old mode 100755 new mode 100644 diff --git a/views/layouts/xml/default.ctp b/views/layouts/xml/default.ctp old mode 100755 new mode 100644 diff --git a/views/pages/about.ctp b/views/pages/about.ctp old mode 100755 new mode 100644 diff --git a/views/pages/home.ctp b/views/pages/home.ctp old mode 100755 new mode 100644 diff --git a/views/pages/start.ctp b/views/pages/start.ctp old mode 100755 new mode 100644 diff --git a/views/permissions/admin_add.ctp b/views/permissions/admin_add.ctp old mode 100755 new mode 100644 diff --git a/views/permissions/admin_index.ctp b/views/permissions/admin_index.ctp old mode 100755 new mode 100644 diff --git a/views/projects/add.ctp b/views/projects/add.ctp old mode 100755 new mode 100644 diff --git a/views/projects/admin_index.ctp b/views/projects/admin_index.ctp old mode 100755 new mode 100644 diff --git a/views/projects/edit.ctp b/views/projects/edit.ctp old mode 100755 new mode 100644 diff --git a/views/projects/index.ctp b/views/projects/index.ctp old mode 100755 new mode 100644 diff --git a/views/projects/rss/index.ctp b/views/projects/rss/index.ctp old mode 100755 new mode 100644 diff --git a/views/projects/start.ctp b/views/projects/start.ctp old mode 100755 new mode 100644 diff --git a/views/projects/view.ctp b/views/projects/view.ctp old mode 100755 new mode 100644 diff --git a/views/repo/fork_it.ctp b/views/repo/fork_it.ctp old mode 100755 new mode 100644 diff --git a/views/repo/tar/download.ctp b/views/repo/tar/download.ctp old mode 100755 new mode 100644 diff --git a/views/source/index.ctp b/views/source/index.ctp old mode 100755 new mode 100644 diff --git a/views/source/view.ctp b/views/source/view.ctp old mode 100755 new mode 100644 diff --git a/views/tickets/add.ctp b/views/tickets/add.ctp old mode 100755 new mode 100644 diff --git a/views/tickets/index.ctp b/views/tickets/index.ctp old mode 100755 new mode 100644 index df633d2..449fb92 --- a/views/tickets/index.ctp +++ b/views/tickets/index.ctp @@ -21,7 +21,12 @@ echo $form->select('Ticket.priority', $priorities, null, array('multiple' => 'checkbox')); ?> </div> - + <div class="input-row"> + <?php + echo $form->label('Ticket.statuses.closed', __('status', true), 'title'); + echo $form->select('Ticket.status', $statuses, null, array('multiple' => 'checkbox')); + ?> + </div> <?php echo $form->submit('update'); ?> </fieldset> <?php echo $form->end(); ?> @@ -48,15 +53,6 @@ if (!empty($CurrentUser->username)) { )), $active); } -foreach ($statuses as $state) { - $active = null; - if ($status == $state) { - $active = array('class' => 'active'); - } - $links[] = $html->link(__($state, true), array_merge($this->passedArgs, array( - 'status' => $state - )), $active); -} echo join(' | ', $links); ?> diff --git a/views/tickets/view.ctp b/views/tickets/view.ctp old mode 100755 new mode 100644 diff --git a/views/timeline/rss/index.ctp b/views/timeline/rss/index.ctp old mode 100755 new mode 100644 diff --git a/views/users/add.ctp b/views/users/add.ctp old mode 100755 new mode 100644 diff --git a/views/users/admin_index.ctp b/views/users/admin_index.ctp old mode 100755 new mode 100644 diff --git a/views/users/change.ctp b/views/users/change.ctp old mode 100755 new mode 100644 diff --git a/views/users/edit.ctp b/views/users/edit.ctp old mode 100755 new mode 100644 diff --git a/views/users/forgotten.ctp b/views/users/forgotten.ctp old mode 100755 new mode 100644 diff --git a/views/users/login.ctp b/views/users/login.ctp old mode 100755 new mode 100644 diff --git a/views/users/view.ctp b/views/users/view.ctp old mode 100755 new mode 100644 diff --git a/views/versions/admin_add.ctp b/views/versions/admin_add.ctp old mode 100755 new mode 100644 diff --git a/views/versions/admin_edit.ctp b/views/versions/admin_edit.ctp old mode 100755 new mode 100644 diff --git a/views/versions/index.ctp b/views/versions/index.ctp old mode 100755 new mode 100644 diff --git a/views/versions/view.ctp b/views/versions/view.ctp old mode 100755 new mode 100644 index ac94c0d..faa2d02 --- a/views/versions/view.ctp +++ b/views/versions/view.ctp @@ -10,12 +10,11 @@ $this->set('showdown', true); </h3> <p class="date"> - <strong><?php __('Created') ?>:</strong> <?php echo date('Y-m-d', strtotime($version['Version']['created']));?> - <?php if (empty($version['Version']['completed'])): ?> <strong><?php __('Due by') ?>:</strong> <?php echo $version['Version']['due_date'];?> + <?php else:?> + <strong><?php __('Completed') ?>:</strong> <?php echo date('Y-m-d', strtotime($version['Version']['due_date']));?> <?php endif; ?> - </p> <p class="summary wiki-text"> diff --git a/views/wiki/add.ctp b/views/wiki/add.ctp old mode 100755 new mode 100644 diff --git a/views/wiki/index.ctp b/views/wiki/index.ctp old mode 100755 new mode 100644 diff --git a/views/wiki/rss/index.ctp b/views/wiki/rss/index.ctp old mode 100755 new mode 100644 diff --git a/webroot/js/ghighlight.js b/webroot/js/ghighlight.js index 036bf1d..62cb73f 100644 --- a/webroot/js/ghighlight.js +++ b/webroot/js/ghighlight.js @@ -393,7 +393,7 @@ var hljs = new function() { function insertLines(highlightedText, startAt, alternatingRows) { var counter = startAt + 1 - 1; //make sure it is a number; otherwise Math.log doesn't work right - var result = "<ol>"; + var result = ""; //IE does wierd stuff when splitting blank lines, so insert a space highlightedText = highlightedText.replace(/(\r\n|\r|\n)(\r\n|\r|\n)/g, "$1 $2"); var lines = highlightedText.split(/\r\n|\r|\n/); @@ -441,7 +441,7 @@ var hljs = new function() { counter++; result = result + newline; } - return result + "</ol>"; + return result + ""; } function langRe(language, value, global) { diff --git a/webroot/js/ghighlight.min.js b/webroot/js/ghighlight.min.js index 992c7fb..98fd994 100644 --- a/webroot/js/ghighlight.min.js +++ b/webroot/js/ghighlight.min.js @@ -78,7 +78,7 @@ function rjust(st,siz){t=siz-st.length;if(t>0){st=rspaces(t)+st;} return st;} function rspaces(len){s=" ";for(i=0;i<len;i++){s=s+" ";} return s;} -function insertLines(highlightedText,startAt,alternatingRows){var counter=startAt+1-1;var result="<ol>";highlightedText=highlightedText.replace(/(\r\n|\r|\n)(\r\n|\r|\n)/g,"$1 $2");var lines=highlightedText.split(/\r\n|\r|\n/);var spaces=Math.ceil(Math.log(lines.length)/Math.log(10));var newline="";var line;var i;var tokenArray=new Array();if(spaces<6) +function insertLines(highlightedText,startAt,alternatingRows){var counter=startAt+1-1;var result="";highlightedText=highlightedText.replace(/(\r\n|\r|\n)(\r\n|\r|\n)/g,"$1 $2");var lines=highlightedText.split(/\r\n|\r|\n/);var spaces=Math.ceil(Math.log(lines.length)/Math.log(10));var newline="";var line;var i;var tokenArray=new Array();if(spaces<6) spaces=6;for(line=0;line<lines.length-1;++line){newline="";if(alternatingRows){newline="<span class=\"";if(line%2==0) newline=newline+"coderow";else newline=newline+"alternaterow";newline=newline+"\">";} @@ -88,7 +88,7 @@ var tokens=lines[line].match(/(<span class="\w+">)|(<\/span>)|(.*?)/g);for(var t newline=newline+lines[line];for(var restartTokenCt=0;restartTokenCt<tokenArray.length;++restartTokenCt){newline=newline+"</span>";} newline=newline+"\n";if(alternatingRows){newline=newline+"</span>";} counter++;result=result+newline;} -return result+"</ol>";} +return result+"";} function langRe(language,value,global){var mode='m'+(language.case_insensitive?'i':'')+(global?'g':'');return new RegExp(value,mode);} function compileModes(){for(var i in LANGUAGES){if(!LANGUAGES.hasOwnProperty(i)) continue;var language=LANGUAGES[i];for(var j=0;j<language.modes.length;j++){if(language.modes[j].begin)