Skip to content

Commit 87dbdeb

Browse files
committed
New button table layout
1 parent a8c6a47 commit 87dbdeb

File tree

6 files changed

+576
-130
lines changed

6 files changed

+576
-130
lines changed

app/Http/Controllers/LinkTypeViewController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ public function getParamForm($typeid, $linkId = 0)
3838

3939
if (!empty($linkType) && $linkType->typename === 'predefined') {
4040
// get buttons list if showing predefined form
41-
$buttons = Button::select('name')->orderBy('name', 'asc')->get();
41+
$buttons = Button::select()->orderBy('name', 'asc')->get();
4242
foreach ($buttons as $btn) {
4343
$data['buttons'][] = [
4444
'name' => $btn->name,
45-
'title' => ucwords($btn->name),
45+
'title' => $btn->alt,
46+
'exclude' => $btn->exclude,
4647
'selected' => (is_object($data['params']) && $data['params']->button === $btn->name)
4748
];
4849
}

app/Http/Controllers/UserController.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public function saveLink(request $request)
219219
$button = Button::where('name', $request->button)->first();
220220

221221
if ($button && empty($LinkTitle))
222-
$LinkTitle = ucwords($button->name);
222+
$LinkTitle = $button->alt;
223223

224224
if ($linkType->typename == 'video' && empty($LinkTitle)) {
225225
$embed = OEmbed::get($LinkURL);
@@ -789,7 +789,6 @@ public function editPage(Request $request)
789789
$name = $request->name;
790790
$checkmark = $request->checkmark;
791791
$sharebtn = $request->sharebtn;
792-
$tablinks = $request->tablinks;
793792

794793
if(env('HOME_URL') !== '' && $pageName != $littlelink_name && $littlelink_name == env('HOME_URL')){
795794
EnvEditor::editKey('HOME_URL', $pageName);
@@ -817,12 +816,6 @@ public function editPage(Request $request)
817816
} else {
818817
UserData::saveData($userId, 'disable-sharebtn', true);
819818
}
820-
821-
if ($tablinks == "on") {
822-
UserData::saveData($userId, 'links-new-tab', true);
823-
} else {
824-
UserData::saveData($userId, 'links-new-tab', false);
825-
}
826819

827820
return Redirect('/studio/page');
828821
}

database/migrations/2021_03_17_044922_create_buttons_table.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ public function up()
1616
Schema::create('buttons', function (Blueprint $table) {
1717
$table->id();
1818
$table->string('name');
19+
$table->string('alt')->nullable();
20+
$table->boolean('exclude')->default(false);
21+
$table->string('group')->nullable();
22+
$table->boolean('mb')->default(false);
1923
$table->timestamps();
2024
});
2125
}

0 commit comments

Comments
 (0)