Skip to content

Commit 1011f25

Browse files
committed
Merge remote-tracking branch 'refs/remotes/SharePoint/master'
2 parents 5bd4299 + d67650e commit 1011f25

File tree

37 files changed

+1035
-1035
lines changed

37 files changed

+1035
-1035
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ Please describe the changes in this PR. Sample description or details around bug
1212
#### Guidance
1313
*You can delete this section when you are submitting the pull request.*
1414
* *Please update this PR information accordingly. We'll use this as part of our release notes in monthly communications.*
15-
* *Please target your PR to 'staging' branch.*
15+
* *Please target your PR to 'master' branch. Released documents are in live branch.*

docs/apis/communication-site-creation-rest.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
Learn how to create and get the status of a new modern SharePoint Communication site with the REST interface.
44

5-
> [!NOTE]
6-
> There is a known bug with this API which is blocking completely this behavior. Fix will be rolling gradually to SharePoint Online by end of October 2017.
7-
85
## Prerequisites
96

107
This topic assumes that you are already familiar with the topics Get to know the SharePoint REST service and Complete basic operations using SharePoint REST endpoints. It does not provide code snippets.

docs/declarative-customization/column-formatting.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
> [!IMPORTANT]
44
> Column formatting is not yet in production. This documentation is in preview and is subject to change.
55
6-
You can use column formatting to customize how fields in SharePoint lists and libraries are displayed. To do this, you construct a JSON object that describes the elements that are displayed when a field is included in a list view, and the styles to be applied to those elements. The column formatting does not change the data in the list item or file; it only changes how it’s displayed to users who browse the list. Anyone who can create and manage views in a list can use column formatting to configure how view fields are displayed.
6+
You can use column formatting to customize how fields in SharePoint lists and libraries are displayed. To do this, you construct a JSON object that describes the elements that are displayed when a field is included in a list view, and the styles to be applied to those elements. The column formatting does not change the data in the list item or file; it only changes how it’s displayed to users who browse the list. Anyone who can create and manage views in a list can use column formatting to configure how view fields are displayed.
77

8-
For example, a list with the fields Title, Effort, Assigned To, and Status with no customizations applied might look like this:
8+
For example, a list with the fields Title, Effort, Assigned To, and Status with no customizations applied might look like this:
99

1010
![SharePoint list with four unformatted columns](../images/sp-columnformatting-none.png)
1111

@@ -74,19 +74,19 @@ The following image shows an example of conditional formatting applied to a numb
7474

7575
![Severity warning of 70 with orange background](../images/sp-columnformatting-conditionalbasic.png)
7676

77-
This example customizes a number field to color that field red when its value less than 70. This example adds a style attribute to the parent `<div />` element, specifies a CSS class (`sp-field-severity--warning`) to apply to that item if the value inside the field is less than 70, and specifies no color if the value is outside that range (in which case it will use the default color for values in that list view).
78-
Note: this example uses a binary operation with the less than operator, "<", nested inside the conditional operation indicated by the operator, ":". Another description of the section in the following example is: If @currentField < 70 Then class = sp-field-severity--warning.
77+
This example customizes a number field to color that field yellow when its value is 70 or less. This example adds a style attribute to the parent `<div />` element, specifies a CSS class (`sp-field-severity--warning`) to apply to that item if the value inside the field is less than or equal to 70, and specifies no color if the value is outside that range (in which case it will use the default color for values in that list view).
78+
Note: this example uses a binary operation with the less than operator, "<", nested inside the conditional operation indicated by the operator, "?". Another description of the section in the following example is: If @currentField <= 70 Then class = sp-field-severity--warning.
7979

8080
```JSON
8181
{
8282
"elmType": "div",
8383
"txtContent": "@currentField",
8484
"attributes": {
8585
"class": {
86-
"operator": ":",
86+
"operator": "?",
8787
"operands": [
8888
{
89-
"operator": "<",
89+
"operator": "<=",
9090
"operands": [
9191
"@currentField",
9292
70
@@ -112,12 +112,12 @@ This pattern is useful when you want different values to map to different levels
112112
<!-- The schema URL will need to be updated when it is changed from customformatter to columnformatting -->
113113
```JSON
114114
{
115-
"$schema": "https://columnformatting.sharepointpnp.com/customFormatterSchema.json",
115+
"$schema": "http://columnformatting.sharepointpnp.com/columnFormattingSchema.json",
116116
"debugMode": true,
117117
"elmType": "div",
118118
"attributes": {
119119
"class": {
120-
"operator": ":",
120+
"operator": "?",
121121
"operands": [
122122
{
123123
"operator": "==",
@@ -133,7 +133,7 @@ This pattern is useful when you want different values to map to different levels
133133
},
134134
"sp-field-severity--good",
135135
{
136-
"operator": ":",
136+
"operator": "?",
137137
"operands": [
138138
{
139139
"operator": "==",
@@ -149,7 +149,7 @@ This pattern is useful when you want different values to map to different levels
149149
},
150150
"sp-field-severity--low",
151151
{
152-
"operator": ":",
152+
"operator": "?",
153153
"operands": [
154154
{
155155
"operator": "==",
@@ -165,7 +165,7 @@ This pattern is useful when you want different values to map to different levels
165165
},
166166
"sp-field-severity--warning",
167167
{
168-
"operator": ":",
168+
"operator": "?",
169169
"operands": [
170170
{
171171
"operator": "==",
@@ -199,7 +199,7 @@ This pattern is useful when you want different values to map to different levels
199199
},
200200
"attributes": {
201201
"iconName": {
202-
"operator": ":",
202+
"operator": "?",
203203
"operands": [
204204
{
205205
"operator": "==",
@@ -215,7 +215,7 @@ This pattern is useful when you want different values to map to different levels
215215
},
216216
"CheckMark",
217217
{
218-
"operator": ":",
218+
"operator": "?",
219219
"operands": [
220220
{
221221
"operator": "==",
@@ -231,7 +231,7 @@ This pattern is useful when you want different values to map to different levels
231231
},
232232
"Forward",
233233
{
234-
"operator": ":",
234+
"operator": "?",
235235
"operands": [
236236
{
237237
"operator": "==",
@@ -247,7 +247,7 @@ This pattern is useful when you want different values to map to different levels
247247
},
248248
"Error",
249249
{
250-
"operator": ":",
250+
"operator": "?",
251251
"operands": [
252252
{
253253
"operator": "==",
@@ -300,7 +300,7 @@ This example colors the current field red when the value inside an item's DueDat
300300
"txtContent": "@currentField",
301301
"style": {
302302
"color": {
303-
"operator": ":",
303+
"operator": "?",
304304
"operands": [
305305
{
306306
"operator": "<=",
@@ -325,7 +325,7 @@ To compare the value of a date/time field against a date that's not `@now`, foll
325325
"txtContent": "@currentField",
326326
"style": {
327327
"color": {
328-
"operator": ":",
328+
"operator": "?",
329329
"operands": [
330330
{
331331
"operator": "<=",
@@ -354,7 +354,7 @@ To compare a date/time field value against another date constant, use the **Date
354354
"txtContent": "@currentField",
355355
"style": {
356356
"color": {
357-
"operator": ":",
357+
"operator": "?",
358358
"operands": [
359359
{
360360
"operator": "<=",
@@ -461,7 +461,7 @@ This example applies `background-color` and `border-top` styles to create a data
461461
},
462462
"style": {
463463
"width": {
464-
"operator": ":",
464+
"operator": "?",
465465
"operands": [
466466
{
467467
"operator": ">",
@@ -511,7 +511,7 @@ This example relies on two number fields, `Before` and `After`, for which the va
511511
"elmType": "span",
512512
"attributes": {
513513
"class": {
514-
"operator": ":",
514+
"operator": "?",
515515
"operands": [
516516
{
517517
"operator": ">",
@@ -525,7 +525,7 @@ This example relies on two number fields, `Before` and `After`, for which the va
525525
]
526526
},
527527
"iconName": {
528-
"operator": ":",
528+
"operator": "?",
529529
"operands": [
530530
{
531531
"operator": ">",
@@ -536,7 +536,7 @@ This example relies on two number fields, `Before` and `After`, for which the va
536536
},
537537
"SortUp",
538538
{
539-
"operator": ":",
539+
"operator": "?",
540540
"operands": [
541541
{
542542
"operator": "<",
@@ -607,7 +607,7 @@ Creating custom column formatting JSON from scratch is simple if you understand
607607

608608
```JSON
609609
{
610-
"$schema": "https://columnformatting.sharepointpnp.com/customFormatterSchema.json"
610+
"$schema": "http://columnformatting.sharepointpnp.com/columnFormattingSchema.json"
611611
}
612612
```
613613
You now have validation and autocomplete to create your JSON. You can start adding your JSON after the first line that defines the schema ___location.
@@ -783,7 +783,7 @@ The following example shows the value of a style object. In this example, two st
783783
{
784784
"padding": "4px",
785785
"background-color": {
786-
"operator": ":",
786+
"operator": "?",
787787
"operands": [
788788
{
789789
"operator": "<",
@@ -848,7 +848,7 @@ The following example shows an Expression object that performs the following exp
848848

849849
```JSON
850850
{
851-
"operator": ":",
851+
"operator": "?",
852852
"operands": [
853853
{
854854
"operator": ">",
@@ -901,7 +901,7 @@ Operators specify the type of operation to perform. The following operators are
901901
- Date()
902902
- cos
903903
- sin
904-
- :
904+
- ?
905905

906906
**Binary operators** - The following are the standard arithmetic binary operators that expect two operands:
907907

@@ -924,7 +924,7 @@ Operators specify the type of operation to perform. The following operators are
924924

925925
**Conditional operator** - The conditional operator is:
926926

927-
- :
927+
- ?
928928

929929
This is to achieve an expression equivalent to a ? b : c, where if the expression a evaluates to true, then the result is b, else the result is c.
930930

docs/declarative-customization/site-theming/sharepoint-site-theming-csom.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ Before you get started, make sure that you're familiar with the following:
77
- [Using the Client Object Model](https://msdn.microsoft.com/en-us/library/ff798388.aspx)
88
- [Common Programming Tasks in the Managed Client Object Model](https://msdn.microsoft.com/en-us/library/ee537013.aspx)
99

10-
Install the following components for CSOM development:
11-
12-
* [SharePoint Server 2016 Client Component SDK](https://www.microsoft.com/en-us/download/details.aspx?id=51679)
13-
* [Microsoft.SharePointOnline.CSOM](https://www.nuget.org/packages/Microsoft.SharePointOnline.CSOM/) NuGet package (version 16.1.6906.1200 or later)
10+
You will also need to reference the [Microsoft.SharePointOnline.CSOM](https://www.nuget.org/packages/Microsoft.SharePointOnline.CSOM/) NuGet package (version 16.1.6906.1200 or later).
1411

1512
## CSOM code example
1613

@@ -23,17 +20,19 @@ The following example shows how to create a __Microsoft.Online.SharePoint.Tenant
2320
2421
```C#
2522
using System.Security;
26-
using SPClient=Microsoft.SharePoint.Client;
23+
using Microsoft.SharePoint.Client;
2724
using Microsoft.Online.SharePoint.TenantAdministration;
2825
using Microsoft.Online.SharePoint.TenantManagement;
2926

30-
SPClient.ClientContext ctx = new SPClient.ClientContext("https://mysite-admin.sharepoint.com/");
27+
...
28+
29+
ClientContext ctx = new ClientContext("https://mysite-admin.sharepoint.com/");
3130
var pwd = "mypassword";
3231
var passWord = new SecureString();
3332
foreach (char c in pwd.ToCharArray()) passWord.AppendChar(c);
34-
ctx.Credentials = new SPClient.SharePointOnlineCredentials("[email protected]", passWord);
33+
ctx.Credentials = new SharePointOnlineCredentials("[email protected]", passWord);
3534
Tenant tenant = new Tenant(ctx);
36-
SPClient.ClientObjectList<ThemeProperties> themes = tenant.GetAllTenantThemes();
35+
ClientObjectList<ThemeProperties> themes = tenant.GetAllTenantThemes();
3736
```
3837

3938
## Theme definition example
@@ -72,7 +71,7 @@ public class SPOTheme 
7271

7372
## Applying a theme
7473

75-
The methods described in this section are used to manage the available themes in your tenant. To _apply_ a theme to a particular SharePoint website, use the [SPWeb.ApplyTheme](https://msdn.microsoft.com/en-us/library/office/jj251358.aspx) method of the [Microsoft.SharePoint.Client.Web](https://msdn.microsoft.com/en-us/library/office/microsoft.sharepoint.client.web.aspx) class.
74+
There's currently no supported API to programmatically apply a theme to specific site.
7675

7776
## Methods/properties of the Microsoft.Online.SharePoint.TenantAdministration.Tenant class
7877

@@ -107,7 +106,7 @@ __Parameters:__ string name<br/>
107106
__Return type:__ ThemeProperties
108107

109108
### HideDefaultThemes public property
110-
This property indicates whether the default themes are hidden in the theme picker UI for modern pages. You might want to set this property to __true__ after you define custom themes, to allow only specific themes to be used.
109+
This property indicates whether the default themes are available in the theme picker UI. The default setting is __false__ (the default themes are available), but you might want to set this property to __true__ after you define custom themes, to allow only specific themes to be used.
111110

112111
__Namespace:__ Microsoft.Online.SharePoint.TenantAdministration.Tenant<br/>
113112
__Type:__ Boolean
@@ -121,7 +120,7 @@ __Return type:__ ClientResult<bool>
121120

122121
## Methods of the Microsoft.Online.SharePoint.TenantManagement.Tenant class
123122

124-
Use the following methods to manage themes in a multitenant environment.
123+
These are alternative APIs to manage your themes in tenant level.
125124

126125
### AddTenantTheme public method
127126
Add a theme to the tenant.

docs/declarative-customization/site-theming/sharepoint-site-theming-powershell.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -124,20 +124,6 @@ C:\> Get-SPOTheme -Name "Custom Cyan" | ConvertTo-Json
124124
```
125125
Note that this example uses the PowerShell _ConvertTo-Json_ filter to display the theme in JSON format.
126126

127-
To see all the themes currently available in the tenant store, use **Get-SPOTheme** with no arguments.
128-
129-
```powershell
130-
c:\> Get-SPOTheme
131-
Blue
132-
Orange
133-
Red
134-
Purple
135-
Green
136-
Gray
137-
Dark Yellow
138-
Dark Blue
139-
Custom Cyan
140-
```
141127
## Remove-SPOTheme
142128

143129
The **Remove-SPOTheme** cmdlet removes a theme from your tenant store. For example, this cmdlet removes the "Custom Cyan" theme that was used in the previous examples.

docs/declarative-customization/site-theming/sharepoint-site-theming-rest-api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,4 @@ RestRequest("/_api/thememanager/GetTenantThemingOptions");
133133
* [SharePoint site theming: CSOM](sharepoint-site-theming-csom.md)
134134
* [Complete basic operations using SharePoint REST endpoints](https://dev.office.com/sharepoint/docs/apis/rest/complete-basic-operations-using-sharepoint-rest-endpoints.md)
135135
* [Making REST calls with C# and JavaScript for SharePoint 2013](http://www.microsoft.com/resources/msdn/en-us/office/media/video/video.mdl?cid=sdc&from=mscomsdc&VideoID=4e4cc094-ff69-405b-852f-2ac7c41293c5)
136+

docs/design/grid-and-responsive-design.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ The small size has a single centered column area, with 20px margins left and rig
8585
#### Medium 480 x 854
8686
The medium size has 12 columns, with 16px gutters.
8787

88-
![Communication site medium grid](../images/design-grid-Communication-siteM-Canvas-16px-gutters.png)
88+
![Communication site medium grid](../images/design-grid-Communication-site-M-Canvas-16px-gutters.png)
8989

9090
#### Large 640 x 1024
9191
The large size has 12 columns, with 24px gutters.
9292

93-
![Communication site large grid](../images/design-grid-Communication-siteL-Canvas-24px-gutters.png)
93+
![Communication site large grid](../images/design-grid-Communication-site-L-Canvas-24px-gutters.png)
9494

9595
#### XL 1024 x 768
9696
The XL size has a twelve columns, with 24px gutters.

0 commit comments

Comments
 (0)