Skip to content

Commit

Permalink
Popup management, panels, bugs, etc.
Browse files Browse the repository at this point in the history
Added bootstrap.js version 3.3.5
Updated popup management system
Updated actions container holder bugs
EF partial supporting to 14.2
Other improvements
  • Loading branch information
Terricks committed Jul 28, 2015
1 parent 4d0b580 commit 1d105fc
Show file tree
Hide file tree
Showing 63 changed files with 1,396 additions and 1,109 deletions.
4 changes: 2 additions & 2 deletions 14.2/BusinessObjects/XAFBootstrapConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@

namespace XAF_Bootstrap.BusinessObjects
{
[DefaultClassOptions, ObjectCaptionFormat("{0:Theme}"), DefaultProperty("Theme"), XafDisplayName("XAF Bootstrap Configuration"), ImageName("BO_List"), CreatableItem(false)]
[DefaultClassOptions, ObjectCaptionFormat("{0:Theme}"), DefaultProperty("Theme"), XafDisplayName("XAF Bootstrap Configuration"), ImageName("BO_List"), CreatableItem(false), NavigationItem(false)]
public class XAFBootstrapConfiguration : BaseObject
{
public static XAFBootstrapConfiguration Instance
{
get
{
return XAF_Bootstrap.DatabaseUpdate.Updater.Configuration((WebApplication.Instance as XafApplication).CreateObjectSpace());
return XAF_Bootstrap.DatabaseUpdate.Updater.Configuration((WebApplication.Instance as XafApplication).CreateObjectSpace(typeof(XAFBootstrapConfiguration)));
}
}

Expand Down
7 changes: 7 additions & 0 deletions 14.2/Content/bootstrap_css/bootstrap-dx.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ table.xaf-bootstrap tbody td, table.xaf-bootstrap tbody th {

.view-action {
padding-right: 15px;
padding-bottom: 4px;
}

.view-actions {
Expand Down Expand Up @@ -113,6 +114,7 @@ table.xaf-bootstrap tbody td, table.xaf-bootstrap tbody th {

.actions button {
margin-right: 2px;
margin-bottom: 2px;
}

.alert-sm {
Expand All @@ -127,4 +129,9 @@ table.xaf-bootstrap tbody td, table.xaf-bootstrap tbody th {

.settings-button {
font-size: 15px;
}

.loading-progress {
margin: 0;
height: 5px;
}
4 changes: 4 additions & 0 deletions 14.2/Content/bootstrap_js/bootstrap-dx.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
function toggleMenuItem(item, selector) {
if ($(item).parent().next(selector).hasClass('in')) { { $(selector).collapse('hide'); } } else { { $(selector).collapse('show'); } };
}

function refreshView() {
RaiseXafCallback(globalCallbackControl, "", "XafParentWindowRefresh", "", false);
}
8 changes: 4 additions & 4 deletions 14.2/Content/bootstrap_js/bootstrap.min.js

Large diffs are not rendered by default.

Binary file modified 14.2/Content/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
485 changes: 272 additions & 213 deletions 14.2/Content/fonts/glyphicons-halflings-regular.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified 14.2/Content/fonts/glyphicons-halflings-regular.ttf
Binary file not shown.
Binary file modified 14.2/Content/fonts/glyphicons-halflings-regular.woff
Binary file not shown.
Binary file not shown.
23 changes: 22 additions & 1 deletion 14.2/Controllers/ViewFrameController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
using DevExpress.ExpressApp.Editors;
using XAF_Bootstrap.Templates;
using XAF_Bootstrap.Editors.XafBootstrapTableEditor;
using DevExpress.ExpressApp.Web;

namespace XAF_Bootstrap.Controllers
{
Expand All @@ -38,9 +39,21 @@ public ViewFrameController()
RegisterActions(components);
}

protected override void OnActivated()
{
base.OnActivated();

var focusController = Frame.GetController<DevExpress.ExpressApp.Web.SystemModule.FocusController>();
if (focusController != null)
focusController.Active["XafBootstrapActive"] = false;
}

protected override void OnViewControlsCreated()
{
base.OnViewControlsCreated();
base.OnViewControlsCreated();

Helpers.AddMeta(WebWindow.CurrentRequestPage);

if (View is ListView)
{
var ListView = (View as ListView);
Expand All @@ -62,5 +75,13 @@ protected override void OnViewControlsCreated()
else
Helpers.Session[View.Id + "_Frame"] = Frame;
}

protected override void OnDeactivated()
{
var focusController = Frame.GetController<DevExpress.ExpressApp.Web.SystemModule.FocusController>();
if (focusController != null)
focusController.Active.RemoveItem("XafBootstrapActive");
base.OnDeactivated();
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
#region Copyright (c) 2014-2015 DevCloud Solutions
/*
{********************************************************************************}
{ }
{ Copyright (c) 2014-2015 DevCloud Solutions }
{ }
{ Licensed under the Apache License, Version 2.0 (the "License"); }
{ you may not use this file except in compliance with the License. }
{ You may obtain a copy of the License at }
{ }
{ http://www.apache.org/licenses/LICENSE-2.0 }
{ }
{ Unless required by applicable law or agreed to in writing, software }
{ distributed under the License is distributed on an "AS IS" BASIS, }
{ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. }
{ See the License for the specific language governing permissions and }
{ limitations under the License. }
{ }
{********************************************************************************}
*/
#endregion

using System;
using System.Collections.Generic;
using System.Linq;
using DevExpress.ExpressApp;
using DevExpress.ExpressApp.Actions;
using XAF_Bootstrap.Templates;
using DevExpress.ExpressApp.DC;

namespace XAF_Bootstrap.Controllers.XafBootstrapConfiguration
{
public partial class XafBootstrapConfigurationAction : ViewController
{
public XafBootstrapConfigurationAction()
{
InitializeComponent();
}
protected override void OnViewControlsCreated()
{
base.OnViewControlsCreated();
var actionVisible = SecuritySystem.CurrentUser == null;
if (!actionVisible) {
IMemberInfo memberInfo;
var roles = ObjectFormatValues.GetValueRecursive("Roles", SecuritySystem.CurrentUser, out memberInfo) as IEnumerable<object>;
foreach (var role in roles)
{
Boolean isAdministrative;
if (Boolean.TryParse(String.Concat(ObjectFormatValues.GetValueRecursive("IsAdministrative", role, out memberInfo)), out isAdministrative))
{
if (isAdministrative)
{
actionVisible = true;
break;
}
}
}
}
}
protected override void OnDeactivated()
{
XafBootstrapConfigurationActionItem.Active.RemoveItem("IsActionActive");
base.OnDeactivated();
}
private void XafBootstrapConfigurationActionItem_Execute(object sender, SimpleActionExecuteEventArgs e)
{
var os = Application.CreateObjectSpace();
var view = Application.CreateDetailView(os, XAF_Bootstrap.DatabaseUpdate.Updater.Configuration(os));
Application.MainWindow.SetView(view);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="XafBootstrapConfigurationActionItem.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected override void OnViewControlsCreated()
Frame.GetController<DashboardCustomizationController>().OrganizeDashboardAction.Active["CustomDashboardViewRootController"] = false;

DashboardView DetailView = (View as DashboardView);
XafBootstrapView view = (XafBootstrapView)(Frame.Template as BaseXafPage).LoadControl("~/Templates/XafBootstrapView.ascx");
XafBootstrapView view = (XafBootstrapView)(Frame.Template as BaseXafPage).LoadControl("~/XafBootstrapView.ascx");
view.IsRootView = true;
CustomPanel cp = new CustomPanel();
IList<Control> ctrls = new List<Control>();
Expand Down
2 changes: 1 addition & 1 deletion 14.2/Controllers/XafBootstrapDetailViewRootController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected override void OnViewControlsCreated()
base.OnViewControlsCreated();

DetailView DetailView = (View as DetailView);
XafBootstrapView view = (XafBootstrapView)(Frame.Template as BaseXafPage).LoadControl("~/Templates/XafBootstrapView.ascx");
XafBootstrapView view = (XafBootstrapView)(Frame.Template as BaseXafPage).LoadControl("~/XafBootstrapView.ascx");
view.IsRootView = true;
CustomPanel cp = new CustomPanel();
IList<Control> ctrls = new List<Control>();
Expand Down

0 comments on commit 1d105fc

Please sign in to comment.