Skip to content

Commit 29960dd

Browse files
committed
More updates
1 parent c9f5673 commit 29960dd

File tree

5 files changed

+22
-45
lines changed

5 files changed

+22
-45
lines changed

src/controllers/Core_GithubController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class Core_GithubController extends BaseController {
55
public function getIndex()
66
{
77
$issues = array();
8-
$allRepos = Config::get('app.allRepos');
8+
$allRepos = Config::get('core::allRepos');
99

1010
foreach ($allRepos as $githubUser => $repos) {
1111
foreach ($repos as $repo => $displayName) {

src/services/HTML.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,21 @@ public static function linkImage($url, $imagesrc, $attributes = array(), $https
3434
return '<a href="'.$url.'"'.static::attributes($attributes).'>'.$imagesrc.'</a>';
3535
}
3636

37+
public static function addButton($url, $iconClass = 'fa-plus')
38+
{
39+
return HTML::linkIcon($url, 'fa '. $iconClass);
40+
}
41+
42+
public static function editButton ($url, $btnClass = 'primary')
43+
{
44+
return HTML::link($url, 'Edit', array('class' => 'btn btn-xs btn-'. $btnClass));
45+
}
46+
47+
public static function deleteButton ($url, $btnClass = 'danger')
48+
{
49+
return HTML::link($url, 'Delete', array('class' => 'confirm-remove btn btn-xs btn-'. $btnClass));
50+
}
51+
3752
/**
3853
* Create a link including twitter bootstrap icons
3954
*

src/services/Utility/CoreImage.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ public function addImage($imageDirectory, $image, $newImageName = null, $thumbna
3333
// Move the full image
3434
$image->move($imageDirectory, $originalName);
3535

36+
// Delete the old image
37+
if (File::exists($imageDirectory .'/'. $newImageName .'.png')) {
38+
File::delete($imageDirectory .'/'. $newImageName .'.png');
39+
}
40+
3641
// Make the image a png
3742
$newImage = Image::make($imageDirectory .'/'. $originalName)
3843
->save($imageDirectory .'/'. $newImageName .'.png');

src/views/helpers/customFormFields.php

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@
236236
Form::submit($value, $parameters)
237237
.'</div>'.
238238
'</div>';
239-
240239
});
241240

242241
Form::macro('bJsonSubmit', function ($value = null, $parameters = array('class' => 'btn btn-sm btn-primary')) {
@@ -251,7 +250,6 @@
251250
Form::submit($value, $parameters)
252251
.'</div>'.
253252
'</div>';
254-
255253
});
256254

257255
Form::macro('bSubmitReset', function ($submitValue = 'Submit', $resetValue = 'Reset', $submitParameters = array('class' => 'btn btn-sm btn-primary'), $resetParameters = array('class' => 'btn btn-sm btn-inverse')) {
@@ -263,45 +261,4 @@
263261
.'</div>'.
264262
'</div>'.
265263
'</div>';
266-
267-
});
268-
269-
HTML::macro('row', function() {
270-
return '<div class="row">';
271-
});
272-
273-
HTML::macro('col', function($size, $offset = null) {
274-
$class = array('col-md-'. $size);
275-
if ($offset != null) {
276-
$class[] = 'col-md-offset-'. $offset;
277-
}
278-
return '<div class="'. implode(' ', $class) .'">';
279-
});
280-
281-
HTML::macro('table', function ($options = array()) {
282-
$tableClass = array('table');
283-
284-
if (!isset($options['condensed']) || $options['condensed'] == true) {
285-
$tableClass[] = 'table-condensed';
286-
}
287-
if (!isset($options['striped']) || $options['striped'] == true) {
288-
$tableClass[] = 'table-striped';
289-
}
290-
if (!isset($options['hover']) || $options['hover'] == true) {
291-
$tableClass[] = 'table-hover';
292-
}
293-
$tableClass = implode(' ', $tableClass);
294-
return '<table class="'. $tableClass .'">';
295-
});
296-
297-
HTML::macro('addButton', function ($url, $iconClass = 'fa-plus') {
298-
return HTML::linkIcon($url, 'fa '. $iconClass);
299-
});
300-
301-
HTML::macro('editButton', function ($url, $btnClass = 'primary') {
302-
return HTML::link($url, 'Edit', array('class' => 'btn btn-xs btn-'. $btnClass));
303-
});
304-
305-
HTML::macro('deleteButton', function ($url, $btnClass = 'danger') {
306-
return HTML::link($url, 'Delete', array('class' => 'confirm-remove btn btn-xs btn-'. $btnClass));
307264
});

src/views/helpers/lefttab.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
}
5858
$('.ajaxLink').click(function() {
5959
60-
$('.ajaxLink_tab').removeClass('active');
60+
$('.ajaxLink').parent().parent().parent().removeClass('active');
6161
$(this).parent().parent().parent().addClass('active');
6262
6363
var link = $(this).attr('id');

0 commit comments

Comments
 (0)