-
Notifications
You must be signed in to change notification settings - Fork 544
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1228 from sbwalker/dev
enhanced ModuleActions component to display panes in a submenu, added more containers to Oqtane theme, added more panes to MultiPane layout, added module outline in edit mode to distinguish modules in panes, consolidated to use a single default AdminPane named "Content", fixed bug related to custom Admin Container behavior
- Loading branch information
Showing
24 changed files
with
287 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
Oqtane.Client/Themes/OqtaneTheme/Containers/DefaultNoTitle.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@inherits ContainerBase | ||
|
||
<div class="container"> | ||
<ModuleActions /><ModuleInstance /> | ||
</div> | ||
|
||
@code { | ||
public override string Name => "No Background Color - No Title"; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
10 changes: 10 additions & 0 deletions
10
Oqtane.Client/Themes/OqtaneTheme/Containers/PrimaryNoTitle.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@inherits ContainerBase | ||
|
||
<div class="container bg-primary"> | ||
<ModuleActions /><ModuleInstance /> | ||
</div> | ||
|
||
@code { | ||
public override string Name => "Primary Background Color - No Title"; | ||
} |
20 changes: 20 additions & 0 deletions
20
Oqtane.Client/Themes/OqtaneTheme/Containers/PrimaryTitle.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@inherits ContainerBase | ||
|
||
<div class="container bg-primary"> | ||
<div class="row px-4"> | ||
<div class="d-flex flex-nowrap"> | ||
<ModuleActions /><h2><ModuleTitle /></h2> | ||
</div> | ||
<hr class="app-rule" /> | ||
</div> | ||
<div class="row px-4"> | ||
<div class="container"> | ||
<ModuleInstance /> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
@code { | ||
public override string Name => "Primary Background Color - With Title"; | ||
} |
10 changes: 10 additions & 0 deletions
10
Oqtane.Client/Themes/OqtaneTheme/Containers/SecondaryNoTitle.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@inherits ContainerBase | ||
|
||
<div class="container bg-secondary"> | ||
<ModuleActions /><ModuleInstance /> | ||
</div> | ||
|
||
@code { | ||
public override string Name => "Secondary Background Color - No Title"; | ||
} |
20 changes: 20 additions & 0 deletions
20
Oqtane.Client/Themes/OqtaneTheme/Containers/SecondaryTitle.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@inherits ContainerBase | ||
|
||
<div class="container bg-secondary"> | ||
<div class="row px-4"> | ||
<div class="d-flex flex-nowrap"> | ||
<ModuleActions /><h2><ModuleTitle /></h2> | ||
</div> | ||
<hr class="app-rule" /> | ||
</div> | ||
<div class="row px-4"> | ||
<div class="container"> | ||
<ModuleInstance /> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
@code { | ||
public override string Name => "Secondary Background Color - With Title"; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,90 @@ | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@inherits LayoutBase | ||
|
||
<div class="row px-4"> | ||
<Pane Name="Top" /> | ||
<div class="container"> | ||
<div class="row"> | ||
<div class="col-md-12"> | ||
<Pane Name="Content" /> | ||
</div> | ||
</div> | ||
</div> | ||
<div class="row px-4"> | ||
<div class="col-sm"><Pane Name="Left" /></div> | ||
<div class="col-sm"><Pane Name="Content" /></div> | ||
<div class="col-sm"><Pane Name="Right" /></div> | ||
</div> | ||
<div class="row px-4"> | ||
<Pane Name="Bottom" /> | ||
<Pane Name="Top Full Width" /> | ||
<div class="container"> | ||
<div class="row"> | ||
<div class="col-md-12"> | ||
<Pane Name="Top 100%" /> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-6"> | ||
<Pane Name="Left 50%" /> | ||
</div> | ||
<div class="col-md-6"> | ||
<Pane Name="Right 50%" /> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-4"> | ||
<Pane Name="Left 33%" /> | ||
</div> | ||
<div class="col-md-4"> | ||
<Pane Name="Center 33%" /> | ||
</div> | ||
<div class="col-md-4"> | ||
<Pane Name="Right 33%" /> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-3"> | ||
<Pane Name="Left Outer 25%" /> | ||
</div> | ||
<div class="col-md-3"> | ||
<Pane Name="Left Inner 25%" /> | ||
</div> | ||
<div class="col-md-3"> | ||
<Pane Name="Right Inner 25%" /> | ||
</div> | ||
<div class="col-md-3"> | ||
<Pane Name="Right Outer 25%" /> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-3"> | ||
<Pane Name="Left 25%" /> | ||
</div> | ||
<div class="col-md-6"> | ||
<Pane Name="Center 50%" /> | ||
</div> | ||
<div class="col-md-3"> | ||
<Pane Name="Right 25%" /> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-8"> | ||
<Pane Name="Left Sidebar 66%" /> | ||
</div> | ||
<div class="col-md-4"> | ||
<Pane Name="Right Sidebar 33%" /> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-4"> | ||
<Pane Name="Left Sidebar 33%" /> | ||
</div> | ||
<div class="col-md-8"> | ||
<Pane Name="Right Sidebar 66%" /> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-12"> | ||
<Pane Name="Bottom 100%" /> | ||
</div> | ||
</div> | ||
</div> | ||
<Pane Name="Bottom Full Width" /> | ||
|
||
@code { | ||
public override string Name => "Multiple Panes"; | ||
|
||
public override string Panes => "Top,Left,Content,Right,Bottom"; | ||
public override string Panes => "Content, Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width"; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,16 @@ | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@namespace Oqtane.Themes.OqtaneTheme | ||
@inherits LayoutBase | ||
|
||
<div class="row px-4"> | ||
<Pane Name="Content" /> | ||
<div class="container"> | ||
<div class="row"> | ||
<div class="col-md-12"> | ||
<Pane Name="Content" /> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
@code { | ||
public override string Name => "Single Pane"; | ||
|
||
public override string Panes => "Content"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.