Skip to content

Commit d1bb02a

Browse files
taylorotwelltaylorotwell
committed
fix conflicts.
2 parents d21713f + c1de1d6 commit d1bb02a

File tree

7 files changed

+130
-84
lines changed

7 files changed

+130
-84
lines changed

‎laravel/database/schema/grammars/sqlserver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public function primary(Table $table, Fluent $command)
138138
{
139139
$name = $command->name;
140140

141-
$columns = $this->columnize($columns);
141+
$columns = $this->columnize($command->$columns);
142142

143143
return 'ALTER TABLE '.$this->wrap($table)." ADD CONSTRAINT {$name} PRIMARY KEY ({$columns})";
144144
}

‎laravel/documentation/changes.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,18 @@
9494

9595
- Add new `asset_url` and `profiler` options to application configuration.
9696
- Replace **auth** configuration file.
97+
98+
Add the following entry to the `aliases` array in `config/application.php`..
99+
100+
'Profiler' => 'Laravel\\Profiling\\Profiler',
101+
102+
Add the following code above `Blade::sharpen()` in `application/start.php`..
103+
104+
if (Config::get('application.profiler'))
105+
{
106+
Profiler::attach();
107+
}
108+
97109
- Upgrade the **paths.php** file.
98110
- Replace the **laravel** folder.
99111

‎laravel/documentation/controllers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
Controllers are classes that are responsible for accepting user input and managing interactions between models, libraries, and views. Typically, they will ask a model for data, and then return a view that presents that data to the user.
1919

20-
The usage of controllers is the most common method of implementingapplication logic in modern web-development. However, Laravel also empowers developers to implement their application logic within routing declarations. This is explored in detail in the [routing document](/docs/routing). New users are encourage to start with controllers. There is nothing that route-based application logic can do that controllers can't.
20+
The usage of controllers is the most common method of implementing application logic in modern web-development. However, Laravel also empowers developers to implement their application logic within routing declarations. This is explored in detail in the [routing document](/docs/routing). New users are encourage to start with controllers. There is nothing that route-based application logic can do that controllers can't.
2121

2222
Controller classes should be stored in **application/controllers** and should extend the Base\_Controller class. A Home\_Controller class is included with Laravel.
2323

@@ -40,7 +40,7 @@ Controller classes should be stored in **application/controllers** and should ex
4040
<a name="controller-routing"></a>
4141
## Controller Routing
4242

43-
It is important to be aware that all routes in Laravel must be explicitly defined, including routes to controllers.
43+
It is important to be aware that all routes in Laravel must be explicitly defined, including routes to controllers.
4444

4545
This means that controller methods that have not been exposed through route registration **cannot** be accessed. It's possible to automatically expose all methods within a controller using controller route registration. Controller route registrations are typically defined in **application/routes.php**.
4646

@@ -78,7 +78,7 @@ Great! Now we can access our "admin" bundle's home controller from the web!
7878
<a name="action-filters"></a>
7979
## Action Filters
8080

81-
Action filters are methods that can be run before or after a controller action. With Laravel you don't only have control over which filters are assigned to which actions. But, you can also choose which http verbs (post, get, put, and delete) will activate a filter.
81+
Action filters are methods that can be run before or after a controller action. With Laravel you don't only have control over which filters are assigned to which actions. But, you can also choose which http verbs (post, get, put, and delete) will activate a filter.
8282

8383
You can assign "before" and "after" filters to controller actions within the controller's constructor.
8484

‎laravel/profiling/profiler.css

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
font-family:Helvetica, "Helvetica Neue", Arial, sans-serif !important;
44
font-size:14px !important;
5-
background-color:#222 !important;
5+
background-color:#222 !important;
66
position:fixed !important;
77
bottom:0 !important;
88
right:0 !important;
@@ -21,7 +21,7 @@ background-repeat:no-repeat;
2121
background-position:5px -8px;
2222
}
2323

24-
.anbu.hidden .anbu-tabs
24+
.anbu-hidden .anbu-tabs
2525
{
2626
background-image:none;
2727
}
@@ -214,3 +214,9 @@ span.anbu-count
214214
white-space: -o-pre-wrap;
215215
word-wrap: break-word;
216216
}
217+
218+
/* hide panel-open elements, will become visible through anbu.start() */
219+
220+
#anbu-close, #anbu-zoom, .anbu-tab-pane {
221+
visibility: hidden;
222+
}

‎laravel/profiling/profiler.js

Lines changed: 103 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -5,78 +5,104 @@ var anbu = {
55
// Binding these elements early, stops jQuery from "querying"
66
// the DOM every time they are used.
77

8-
el : {
9-
main : $('.anbu'),
10-
close : $('#anbu-close'),
11-
zoom : $('#anbu-zoom'),
12-
hide : $('#anbu-hide'),
13-
show : $('#anbu-show'),
14-
tab_pane : $('.anbu-tab-pane'),
15-
hidden_tab_pane : $('.anbu-tab-pane:visible'),
16-
tab : $('.anbu-tab'),
17-
tabs : $('.anbu-tabs'),
18-
tab_links : $('.anbu-tabs a'),
19-
window : $('.anbu-window'),
20-
closed_tabs : $('#anbu-closed-tabs'),
21-
open_tabs : $('#anbu-open-tabs'),
22-
content_area : $('.anbu-content-area')
8+
el: {
9+
main: $('.anbu'),
10+
close: $('#anbu-close'),
11+
zoom: $('#anbu-zoom'),
12+
hide: $('#anbu-hide'),
13+
show: $('#anbu-show'),
14+
tab_pane: $('.anbu-tab-pane'),
15+
hidden_tab_pane: $('.anbu-tab-pane:visible'),
16+
tab: $('.anbu-tab'),
17+
tabs: $('.anbu-tabs'),
18+
tab_links: $('.anbu-tabs a'),
19+
window: $('.anbu-window'),
20+
closed_tabs: $('#anbu-closed-tabs'),
21+
open_tabs: $('#anbu-open-tabs'),
22+
content_area: $('.anbu-content-area')
2323
},
2424

2525
// CLASS ATTRIBUTES
2626
// -------------------------------------------------------------
2727
// Useful variable for Anbu.
2828

29-
isZoomed : false, // is anbu in full screen mode
30-
small_height : $('.anbu-content-area').height(), // initial height of content area
31-
active_tab : 'anbu-active-tab', // the name of the active tab css
32-
tab_data : 'data-anbu-tab', // the data attribute of the tab link
33-
mini_button_width : '2.6em', // size of anbu when compact
34-
window_open : false, // is the top window open?
35-
active_pane : '', // current active pane
29+
// is anbu in full screen mode
30+
is_zoomed: false,
31+
32+
// initial height of content area
33+
small_height: $('.anbu-content-area').height(),
34+
35+
// the name of the active tab css
36+
active_tab: 'anbu-active-tab',
37+
38+
// the data attribute of the tab link
39+
tab_data: 'data-anbu-tab',
40+
41+
// size of anbu when compact
42+
mini_button_width: '2.6em',
43+
44+
// is the top window open?
45+
window_open: false,
46+
47+
// current active pane
48+
active_pane: '',
3649

3750
// START()
3851
// -------------------------------------------------------------
3952
// Sets up all the binds for Anbu!
4053

41-
start : function ()
42-
{
43-
// hide initial elements
54+
start: function() {
4455

45-
anbu.el.close.hide();
46-
anbu.el.zoom.hide();
47-
anbu.el.tab_pane.hide();
56+
// hide initial elements
57+
anbu.el.close.css('visibility', 'visible').hide();
58+
anbu.el.zoom.css('visibility', 'visible').hide();
59+
anbu.el.tab_pane.css('visibility', 'visible').hide();
4860

4961
// bind all click events
50-
anbu.el.close.click( function () { anbu.close_window(); });
51-
anbu.el.hide.click( function () { anbu.hide(); });
52-
anbu.el.show.click( function () { anbu.show(); });
53-
anbu.el.zoom.click( function () { anbu.zoom(); });
54-
anbu.el.tab.click( function () { anbu.clicked_tab($(this)); });
62+
anbu.el.close.click(function(event) {
63+
anbu.close_window();
64+
event.preventDefault();
65+
});
66+
anbu.el.hide.click(function(event) {
67+
anbu.hide();
68+
event.preventDefault();
69+
});
70+
anbu.el.show.click(function(event) {
71+
anbu.show();
72+
event.preventDefault();
73+
});
74+
anbu.el.zoom.click(function(event) {
75+
anbu.zoom();
76+
event.preventDefault();
77+
});
78+
anbu.el.tab.click(function(event) {
79+
anbu.clicked_tab($(this));
80+
event.preventDefault();
81+
});
82+
5583
},
5684

5785
// CLICKED_TAB()
5886
// -------------------------------------------------------------
5987
// A tab has been clicked, decide what to do.
6088

61-
clicked_tab : function (tab)
62-
{
89+
clicked_tab: function(tab) {
90+
6391
// if the tab is closed
64-
if(anbu.window_open && anbu.active_pane == tab.attr(anbu.tab_data))
65-
{
92+
if (anbu.window_open && anbu.active_pane == tab.attr(anbu.tab_data)) {
6693
anbu.close_window();
67-
}
68-
else
69-
{
94+
} else {
7095
anbu.open_window(tab);
7196
}
97+
7298
},
7399

74100
// OPEN_WINDOW()
75101
// -------------------------------------------------------------
76102
// Animate open the top window to the appropriate tab.
77103

78-
open_window : function (tab)
79-
{
104+
open_window: function(tab) {
105+
80106
// can't directly assign this line, but it works
81107
$('.anbu-tab-pane:visible').fadeOut(200);
82108
$('.' + tab.attr(anbu.tab_data)).delay(220).fadeIn(300);
@@ -87,82 +113,82 @@ var anbu = {
87113
anbu.el.zoom.fadeIn(300);
88114
anbu.active_pane = tab.attr(anbu.tab_data);
89115
anbu.window_open = true;
90-
},
91116

117+
},
92118

93119
// CLOSE_WINDOW()
94120
// -------------------------------------------------------------
95121
// Animate closed the top window hiding all tabs.
96122

97-
close_window : function()
98-
{
123+
close_window: function() {
124+
99125
anbu.el.tab_pane.fadeOut(100);
100126
anbu.el.window.slideUp(300);
101127
anbu.el.close.fadeOut(300);
102128
anbu.el.zoom.fadeOut(300);
103129
anbu.el.tab_links.removeClass(anbu.active_tab);
104130
anbu.active_pane = '';
105131
anbu.window_open = false;
106-
},
107132

133+
},
108134

109135
// SHOW()
110136
// -------------------------------------------------------------
111137
// Show the Anbu toolbar when it has been compacted.
112138

113-
show : function ()
114-
{
115-
anbu.el.closed_tabs.fadeOut(600, function () {
116-
anbu.el.open_tabs.fadeIn(200);
117-
})
118-
anbu.el.main.animate({width: '100%'}, 700);
119-
anbu.el.main.removeClass('hidden');
139+
show: function() {
140+
141+
anbu.el.closed_tabs.fadeOut(600, function () {
142+
anbu.el.main.removeClass('anbu-hidden');
143+
anbu.el.open_tabs.fadeIn(200);
144+
});
145+
anbu.el.main.animate({width: '100%'}, 700);
146+
120147
},
121148

122149
// HIDE()
123150
// -------------------------------------------------------------
124151
// Hide the anbu toolbar, show a tiny re-open button.
125152

126-
hide : function ()
127-
{
128-
153+
hide: function() {
154+
129155
anbu.close_window();
130-
anbu.el.window.slideUp(400, function () {
131-
anbu.close_window();
132-
anbu.el.main.addClass('hidden');
133-
anbu.el.open_tabs.fadeOut(200, function () {
134-
anbu.el.closed_tabs.fadeIn(200);
135-
})
136-
anbu.el.main.animate({width: anbu.mini_button_width}, 700);
137-
});
156+
157+
setTimeout(function() {
158+
anbu.el.window.slideUp(400, function () {
159+
anbu.close_window();
160+
anbu.el.main.addClass('anbu-hidden');
161+
anbu.el.open_tabs.fadeOut(200, function () {
162+
anbu.el.closed_tabs.fadeIn(200);
163+
});
164+
anbu.el.main.animate({width: anbu.mini_button_width}, 700);
165+
});
166+
}, 100);
138167

139168
},
140169

141170
// TOGGLEZOOM()
142171
// -------------------------------------------------------------
143172
// Toggle the zoomed mode of the top window.
144173

145-
zoom : function ()
146-
{
147-
if(anbu.isZoomed)
148-
{
174+
zoom: function() {
175+
176+
if (anbu.is_zoomed) {
149177
height = anbu.small_height;
150-
anbu.isZoomed = false;
151-
}
152-
else
153-
{
178+
anbu.is_zoomed = false;
179+
} else {
154180
// the 6px is padding on the top of the window
155181
height = ($(window).height() - anbu.el.tabs.height() - 6) + 'px';
156-
anbu.isZoomed = true;
182+
anbu.is_zoomed = true;
157183
}
158184

159185
anbu.el.content_area.animate({height: height}, 700);
160-
}
161186

162-
}
187+
}
163188

189+
};
164190

165-
jQuery(document).ready(function () {
166-
// launch anbu
191+
// launch anbu on jquery dom ready
192+
jQuery(document).ready(function() {
167193
anbu.start();
168194
});

‎public/laravel/css/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ div.home>h2 {
166166
.content table
167167
{
168168
border-collapse:collapse
169-
border:1px solid #eee;
169+
border: 1px solid #eee;
170170
width:100%;
171171
line-height:1.5em;
172172
}

‎storage/sessions/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

0 commit comments

Comments
 (0)