Skip to content

Commit 37846bc

Browse files
OliSharpeOliSharpe
committed
The code changes in WorkBoxFramework v0.9.8u
1 parent 9fc6fca commit 37846bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+341
-43
lines changed

‎WBF Documentation/WBF Documentation.shfbproj

+14-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{a646268e-5ee8-4550-9e1a-86f44dc9b1f3}</ProjectGuid>
11-
<SHFBSchemaVersion>1.9.3.0</SHFBSchemaVersion>
11+
<SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
1212
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
1313
Studio adds them anyway -->
1414
<AssemblyName>WBF_Documentation</AssemblyName>
@@ -19,12 +19,12 @@
1919
<HtmlHelpName>WBF_Documentation</HtmlHelpName>
2020
<Language>en-US</Language>
2121
<DocumentationSources>
22-
<DocumentationSource sourceFile="..\WorkBoxFramework\bin\Release\WorkBoxFramework.xml" xmlns="" />
23-
<DocumentationSource sourceFile="..\WorkBoxFramework\bin\Release\WorkBoxFramework.dll" xmlns="" />
22+
<DocumentationSource sourceFile="..\WorkBoxFramework\bin\Debug\WorkBoxFramework.xml" />
23+
<DocumentationSource sourceFile="..\WorkBoxFramework\bin\Debug\WorkBoxFramework.dll" />
2424
</DocumentationSources>
2525
<HelpFileFormat>Website</HelpFileFormat>
2626
<IndentHtml>False</IndentHtml>
27-
<FrameworkVersion>.NET 3.5</FrameworkVersion>
27+
<FrameworkVersion>.NET Framework 3.5</FrameworkVersion>
2828
<KeepLogFile>True</KeepLogFile>
2929
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
3030
<CppCommentsFixup>False</CppCommentsFixup>
@@ -33,6 +33,16 @@
3333
<SccProvider>SAK</SccProvider>
3434
<SccAuxPath>SAK</SccAuxPath>
3535
<SccLocalPath>SAK</SccLocalPath>
36+
<ApiFilter />
37+
<ComponentConfigurations />
38+
<HelpAttributes />
39+
<NamespaceSummaries />
40+
<PlugInConfigurations />
41+
<BuildLogFile />
42+
<HtmlHelp1xCompilerPath />
43+
<HtmlHelp2xCompilerPath />
44+
<WorkingPath />
45+
<ComponentPath />
3646
</PropertyGroup>
3747
<!-- There are no properties for these groups. AnyCPU needs to appear in
3848
order for Visual Studio to perform the build. The others are optional

‎WBFAnalysisTool/WBFAnalysisTool.csproj

+10
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@
118118
<PostBuildEvent>
119119
</PostBuildEvent>
120120
</PropertyGroup>
121+
<PropertyGroup>
122+
<SignManifests>true</SignManifests>
123+
</PropertyGroup>
124+
<PropertyGroup>
125+
<ManifestKeyFile>WBFAnalysisTool_TemporaryKey.pfx</ManifestKeyFile>
126+
</PropertyGroup>
127+
<PropertyGroup>
128+
<ManifestCertificateThumbprint>B694B4B6E74354BE9D7A3B9E4DAC7DE89A8DBBE4</ManifestCertificateThumbprint>
129+
</PropertyGroup>
121130
<!--
122131
This section specifies references for the project.
123132
-->
@@ -222,6 +231,7 @@
222231
<DependentUpon>ThisAddIn.Designer.xml</DependentUpon>
223232
</Compile>
224233
<AppDesigner Include="Properties\" />
234+
<None Include="WBFAnalysisTool_TemporaryKey.pfx" />
225235
</ItemGroup>
226236
<ItemGroup />
227237
<!-- Include the build rules for a C# project. -->

‎WBFAnalysisTool/WBFAnalysisTool_TemporaryKey.pfx

1.64 KB
Binary file not shown.

‎WBFExtraWebParts/Layouts/WBFExtraWebParts/EditBlockButtonsDetails.aspx

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@
99

1010
<asp:Content ID="PageHead" ContentPlaceHolderID="PlaceHolderAdditionalPageHead" runat="server">
1111

12+
<SharePoint:ScriptLink ID="WBFjQueryScriptRegistration"
13+
name="WorkBoxFramework/jquery-1.11.3.min.js"
14+
language="javascript"
15+
localizable="false"
16+
runat="server"
17+
/>
18+
1219
<SharePoint:ScriptLink ID="WBFExtraWebPartsScriptRegistration"
1320
name="WBFExtraWebParts/WBFExtraWebParts.js"
1421
language="javascript"

‎WBFExtraWebParts/Layouts/WBFExtraWebParts/EditBlockButtonsDetails.aspx.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected void Page_Load(object sender, EventArgs e)
3232
if (details.Length != 5)
3333
{
3434
WBLogging.Debug("The details sent to this page have the wrong structure: " + allDetails);
35-
ErrorMessage.Text = "There was a problem with the data sent to this page.";
35+
ErrorMessage.Text = "There was a problem with the data sent to this page: " + allDetails;
3636
return;
3737
}
3838

@@ -351,6 +351,7 @@ public TableRow CreateEditableTableRow(int index, int totalRows, String buttonDe
351351
string textHiddenFieldClientID = hiddenField.ClientID;
352352

353353
/* Now we're going to add the scripts for all three colour choices */
354+
/* This is the most ugly spagetti of code I can imagine!!! ... hopefully I'll have time to re-factor sensibly into a javascript object model!!! - Oli Sharpe - 23/2/2015 */
354355
script += "var buttonColor_" + index + " = '" + buttonColorHex + "'; \n";
355356
script += "var borderColorChained_" + index + " = " + (buttonBorderColorIsChained ? "true" : "false") + "; \n";
356357
script += "var borderColor_" + index + " = " + (buttonBorderColorIsChained ? "WBF_buttonColorToBorderColor(buttonColor_" + index + ")" : "'" + buttonBorderColorHex + "'") + "; \n";
@@ -396,9 +397,9 @@ public TableRow CreateEditableTableRow(int index, int totalRows, String buttonDe
396397
script += " } \n";
397398

398399
script += " if (textColorChained_" + index + ") { \n";
399-
script += " textColor_" + index + " = WBF_buttonColorToTextColor(buttonColor); \n";
400+
script += " textColor_" + index + " = WBF_buttonColorToTextColor(buttonColor_" + index + "); \n";
400401
script += " $('#ctl00_PlaceHolderMain_" + textPanelClientID + "').css('background-color', '#' + textColor_" + index + ").colpickSetColor('#' + textColor_" + index + ", true); \n";
401-
script += " $('#ctl00_PlaceHolderMain_" + textHiddenFieldClientID + "').val(textColor); \n";
402+
script += " $('#ctl00_PlaceHolderMain_" + textHiddenFieldClientID + "').val(textColor_" + index + "); \n";
402403
script += " } \n";
403404

404405
script += " $('#wbf-block-button-preview-" + index + "').css( { 'background-color': '#' + buttonColor_" + index + ", 'border-color': '#' + borderColor_" + index + ", 'color': '#' + textColor_" + index + " } ); \n";
@@ -479,8 +480,8 @@ private string CodeFromOneChainImage(int index, string chainedFlag, string butto
479480
script += " hiddenField.val(\"c\"); \n";
480481
script += " " + chainedFlag + "_" + index + " = true; \n";
481482
script += " hiddenField.data('unchained-color', $('#ctl00_PlaceHolderMain_" + hiddenInputClientID + "').val()); \n";
482-
483-
script += " var hex = " + chainedColorFunction + "(buttonColor); \n";
483+
484+
script += " var hex = " + chainedColorFunction + "(buttonColor_" + index + "); \n";
484485
script += " $('#ctl00_PlaceHolderMain_" + panelClientID + "').css('background-color', '#' + hex); \n";
485486
script += " $('#ctl00_PlaceHolderMain_" + hiddenInputClientID + "').val(hex); \n";
486487
script += " $('#" + previewButtonID + "').css('" + colourProperty + "', '#' + hex); \n";

‎WBFExtraWebParts/Layouts/WBFExtraWebParts/EditBlockButtonsDetails.aspx.designer.cs

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WBFExtraWebParts/Layouts/WBFExtraWebParts/WBFExtraWebParts.js

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function WBF_editBlockButtons(callbackFunction, currentBlockButtonsDetailsHidden
1919
SP.UI.ModalDialog.showModalDialog(options);
2020
}
2121

22+
2223
function WBF_UpdateOneBlockButton(idPrefix, webPartUniqueID, index, width, height, title, link, extraText, buttonColor, borderColor, textColor) {
2324

2425
var titleDiv = $("#" + idPrefix + "-title-" + webPartUniqueID + "-" + index).text(title);

‎WBFExtraWebParts/WebParts/BlockButtons/BlockButtons.webpart

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<property name="CssExtraClass" type="string"></property>
1414
<property name="CssExtraStyles" type="string"></property>
1515
<property name="BlockButtonsWidth" type="string">150px</property>
16-
<property name="BlockButtonsHeight" type="string">60px</property>
16+
<property name="BlockButtonsHeight" type="string">70px</property>
1717
<property name="BlockButtonsDetails" type="string">New Button | # | Extra text | #044376 | c | #8ea9c1 | c | #dddddd</property>
1818
</properties>
1919
</data>

‎WBFExtraWebParts/WebParts/BlockButtons/BlockButtonsUserControl.ascx

+7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
<%@ Register Tagprefix="WebPartPages" Namespace="Microsoft.SharePoint.WebPartPages" Assembly="Microsoft.SharePoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
88
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="BlockButtonsUserControl.ascx.cs" Inherits="WBFExtraWebParts.BlockButtons.BlockButtonsUserControl" %>
99

10+
<SharePoint:ScriptLink ID="WBFjQueryScriptRegistration"
11+
name="WorkBoxFramework/jquery-1.11.3.min.js"
12+
language="javascript"
13+
localizable="false"
14+
runat="server"
15+
/>
16+
1017
<SharePoint:ScriptLink ID="WBFExtraWebPartsScriptRegistration"
1118
name="WBFExtraWebParts/WBFExtraWebParts.js"
1219
language="javascript"

‎WBFExtraWebParts/WebParts/BlockButtons/BlockButtonsUserControl.ascx.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ protected void Page_Load(object sender, EventArgs e)
114114

115115
String currentDetails = String.Join(",", detailsToEdit);
116116

117-
// currentDetails = HttpUtility.UrlEncode(currentDetails);
117+
currentDetails = HttpUtility.UrlEncode(currentDetails);
118118

119119
BlockButtonsDetails.Value = currentDetails;
120120

‎WBFExtraWebParts/WebParts/BlockButtons/BlockButtonsUserControl.ascx.designer.cs

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WBFPublicFarmAdmin/Package/Package.Template.xml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Solution xmlns="http://schemas.microsoft.com/sharepoint/">
3+
</Solution>

‎WBFPublicFarmAdmin/Package/Package.package

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="4a92483c-c907-4d4e-8f94-a1e870eb4ffd" solutionId="4a92483c-c907-4d4e-8f94-a1e870eb4ffd" resetWebServer="false" name="WBFPublicFarmAdmin" xmlns="http://schemas.microsoft.com/VisualStudio/2008/SharePointTools/PackageModel">
3+
<features>
4+
<featureReference itemId="3d0419e4-6818-4ef2-88ca-1516cc743503" />
5+
</features>
6+
<projectItems>
7+
<projectItemReference itemId="0df687b8-5299-4865-8dee-3b217202e7f9" />
8+
<projectItemReference itemId="f33b8d1e-1377-444d-a127-7400429691eb" />
9+
<projectItemReference itemId="78868064-bd43-46cc-adc4-0f456f07d2fa" />
10+
</projectItems>
11+
</package>

‎WBFPublicFarmAdmin/Properties/AssemblyInfo.cs

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
using System.Security;
5+
6+
// General Information about an assembly is controlled through the following
7+
// set of attributes. Change these attribute values to modify the information
8+
// associated with an assembly.
9+
[assembly: AssemblyTitle("WBFPublicFarmAdmin")]
10+
[assembly: AssemblyDescription("")]
11+
[assembly: AssemblyConfiguration("")]
12+
[assembly: AssemblyCompany("Microsoft")]
13+
[assembly: AssemblyProduct("WBFPublicFarmAdmin")]
14+
[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: AssemblyCulture("")]
17+
18+
// Setting ComVisible to false makes the types in this assembly not visible
19+
// to COM components. If you need to access a type in this assembly from
20+
// COM, set the ComVisible attribute to true on that type.
21+
[assembly: ComVisible(false)]
22+
23+
// The following GUID is for the ID of the typelib if this project is exposed to COM
24+
[assembly: Guid("f7540b58-d1dc-4093-8707-9d3bc42f99be")]
25+
26+
// Version information for an assembly consists of the following four values:
27+
//
28+
// Major Version
29+
// Minor Version
30+
// Build Number
31+
// Revision
32+
//
33+
// You can specify all the values or you can default the Build and Revision Numbers
34+
// by using the '*' as shown below:
35+
// [assembly: AssemblyVersion("1.0.*")]
36+
[assembly: AssemblyVersion("1.0.0.0")]
37+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎WBFPublicFarmAdmin/WBFPublicFarmAdmin.csproj

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<SchemaVersion>2.0</SchemaVersion>
7+
<ProjectGuid>{F7540B58-D1DC-4093-8707-9D3BC42F99BE}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>WBFPublicFarmAdmin</RootNamespace>
11+
<AssemblyName>WBFPublicFarmAdmin</AssemblyName>
12+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<ProjectTypeGuids>{BB1F664B-9266-4fd6-B973-E1E44974B511};{14822709-B5A1-4724-98CA-57A101D1B079};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15+
<SccProjectName>SAK</SccProjectName>
16+
<SccLocalPath>SAK</SccLocalPath>
17+
<SccAuxPath>SAK</SccAuxPath>
18+
<SccProvider>SAK</SccProvider>
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21+
<DebugSymbols>true</DebugSymbols>
22+
<DebugType>full</DebugType>
23+
<Optimize>false</Optimize>
24+
<OutputPath>bin\Debug\</OutputPath>
25+
<DefineConstants>DEBUG;TRACE</DefineConstants>
26+
<ErrorReport>prompt</ErrorReport>
27+
<WarningLevel>4</WarningLevel>
28+
<UseVSHostingProcess>false</UseVSHostingProcess>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31+
<DebugType>pdbonly</DebugType>
32+
<Optimize>true</Optimize>
33+
<OutputPath>bin\Release\</OutputPath>
34+
<DefineConstants>TRACE</DefineConstants>
35+
<ErrorReport>prompt</ErrorReport>
36+
<WarningLevel>4</WarningLevel>
37+
<UseVSHostingProcess>false</UseVSHostingProcess>
38+
</PropertyGroup>
39+
<ItemGroup>
40+
<Reference Include="System" />
41+
<Reference Include="System.Core" />
42+
<Reference Include="System.Data" />
43+
<Reference Include="System.Data.DataSetExtensions" />
44+
<Reference Include="System.Xml" />
45+
<Reference Include="System.Xml.Linq" />
46+
<Reference Include="Microsoft.SharePoint" />
47+
<Reference Include="Microsoft.SharePoint.Security" />
48+
</ItemGroup>
49+
<ItemGroup>
50+
<Compile Include="Properties\AssemblyInfo.cs" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<None Include="Package\Package.package">
54+
<PackageId>{4a92483c-c907-4d4e-8f94-a1e870eb4ffd}</PackageId>
55+
</None>
56+
<None Include="Package\Package.Template.xml">
57+
<DependentUpon>Package.package</DependentUpon>
58+
</None>
59+
</ItemGroup>
60+
<ItemGroup>
61+
<Folder Include="Features\" />
62+
</ItemGroup>
63+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
64+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\SharePointTools\Microsoft.VisualStudio.SharePoint.targets" />
65+
</Project>

‎WBFPublicFarmAdmin/WBFPublicFarmAdmin.csproj.vspscc

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
""
2+
{
3+
"FILE_VERSION" = "9237"
4+
"ENLISTMENT_CHOICE" = "NEVER"
5+
"PROJECT_FILE_RELATIVE_PATH" = ""
6+
"NUMBER_OF_EXCLUDED_FILES" = "0"
7+
"ORIGINAL_PROJECT_FILE_PATH" = ""
8+
"NUMBER_OF_NESTED_PROJECTS" = "0"
9+
"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
10+
}

‎WBFWebParts/CustomActions/WBFWebPartsConfigLink/Elements.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
GroupId="WorkBoxFramework.SiteSettingsGroup"
66
Location="Microsoft.SharePoint.SiteSettings"
77
Sequence="5100"
8-
Title="WBF Web Parts Configuration"
8+
Title="Web Parts Configuration"
99
RequireSiteAdministrator="TRUE">
1010
<UrlAction Url="_layouts/WBFWebParts/WBFWebPartsConfig.aspx"/>
1111
</CustomAction>

‎WBFWebParts/Layouts/WBFWebParts/WBFWebPartsConfig.aspx

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
</asp:Content>
1717

1818
<asp:Content ID="Main" ContentPlaceHolderID="PlaceHolderMain" runat="server">
19-
<div class="wbf-admin-page" style="padding: 10px; ">
19+
<div class="wbf-admin-page" style="padding: 5px; ">
2020

2121
<h1>WBF Web Parts Configuration</h1>
22+
<p>
2223
Configure the features of the <b>Related Documents</b> and <b>Documents Group</b> web parts.
24+
</p>
2325

2426
<table class="ms-propertysheet" border="0" width="100%" cellspacing="0" cellpadding="0">
2527

‎WBFWebParts/Layouts/WBFWebParts/WhereIsRecordBeingUsed.aspx

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</table>
4949

5050
<!-- Loading in jQuery in case it's not loaded already -->
51-
<script type="text/javascript" src="/_layouts/workboxframework/jquery-1.7.2.min.js"></script>
51+
<script type="text/javascript" src="/_layouts/workboxframework/jquery-1.11.3.min.js"></script>
5252

5353
<script type="text/javascript">
5454
var searched = 0;

0 commit comments

Comments
 (0)