harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-03-17 09:02:48 +01:00
commit b5cc26fe76
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Storage/Directory.php
View File

@ -680,7 +680,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo
throw new DAV\Exception\Forbidden('Permission denied.');
}
else {
throw new DAV\Exception\NotFound('A component of the request file path could not be found.');
throw new DAV\Exception\NotFound('A component of the requested file path could not be found.');
}
}

16
doc/toc.html
View File

@ -2,14 +2,12 @@
<div class="">
<div class="">
<h3 class="panel-title">
About
Tutorials
</h3>
</div>
<div id="about" class="doco-section">
<div id="tutorials" class="doco-section">
<div class="flex-column">
<a class="nav-link" href="/help/about/about">About</a>
<a class="nav-link" href="/help/about/project">Project</a>
<a class="nav-link" href="/help/about/about_hub">About this hub</a>
<a class="nav-link" href="/help/tutorials/personal_channel">Personal Channel</a>
</div>
</div>
</div>
@ -61,12 +59,14 @@
<div class="panel">
<div class="">
<h3 class="panel-title">
Tutorials
About
</h3>
</div>
<div id="tutorials" class="doco-section">
<div id="about" class="doco-section">
<div class="flex-column">
<a class="nav-link" href="/help/tutorials/personal_channel">Personal Channel</a>
<a class="nav-link" href="/help/about/about">About</a>
<a class="nav-link" href="/help/about/project">Project</a>
<a class="nav-link" href="/help/about/about_hub">About this hub</a>
</div>
</div>
</div>

17
doc/tutorials/personal_channel.html
View File

@ -13,8 +13,11 @@ to a personal channel in a natural way.</p>
<p>Enter your name and a nickname for the channel address, and select a "role".
Typically if this is a personal channel that represents you, select a <strong>Social</strong> role
with a level of default privacy that you are comfortable with. If you are unsure,
select <strong>Social - Restricted</strong>.</p>
select <strong>Social - Mostly public</strong> which allows easy interaction and provides privacy when you need it.
Alternatively, <strong>Social - Restricted</strong> is very popular among privacy advocates, though it may require a bit more
effort to meet people. Whichever setting you choose can be changed later if you decide you require more or less privacy than what is provided.</p>
<!-- This section no longer applicable
<h3 id="Configure_your_channel_features">Configure your channel features</h3>
<p>When your new channel is created you are directed to the channel settings page.
@ -26,17 +29,13 @@ enable various features. Remember to press the Submit button when you are done w
your selections.</p>
<p><img class="img-responsive" src="/help/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png" alt="image"><img class="img-responsive" src="/help/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png" alt="image"><img class="img-responsive" src="/help/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png" alt="image"><img class="img-responsive" src="/help/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png" alt="image"></p>
-->
<h3 id="Add_a_profile_photo">Add a profile photo</h3>
<p>Navigate to your channel home by clicking the "Home" icon on the left side of the
navbar, and then select the <strong>About</strong> tab to view your profile.</p>
<p>When your new channel is created, you will be directed to a page determined by your site admin. By default this is the <strong>Edit Profile</strong> page.
<p>Press the <strong>Edit</strong> button on the right to edit your profile information.</p>
<p><img class="img-responsive" src="/help/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png" alt="image"></p>
<p>From the <strong>Profile Tools</strong> dropdown menu, select the <strong>Change profile photo</strong></p>
<p>From the <strong>Profile Tools</strong> dropdown menu, select <strong>Change profile photo</strong> (or just click the profile photo).</p>
<p><img class="img-responsive" src="/help/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png" alt="image"></p>
@ -44,7 +43,7 @@ navbar, and then select the <strong>About</strong> tab to view your profile.</p>
<p><img class="img-responsive" src="/help/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png" alt="image"></p>
<p>When you press <strong>Submit</strong> you will be redirected back to the profile editor.
<p>When you press <strong>Done Editing</strong> you will be redirected back to the profile editor.
(You might need to clear your browser cache if you have trouble seeing the new photo.)</p>
<p><img class="img-responsive" src="/help/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png" alt="image"></p>

6
view/tpl/cloud_directory.tpl
View File

@ -1,5 +1,5 @@
<div id="cloud-drag-area" class="section-content-wrapper-np">
{{if $tiles}}
{{if $tiles}}
<table id="cloud-index">
<tr id="new-upload-progress-bar-1"></tr> {{* this is needed to append the upload files in the right order *}}
</table>
@ -36,7 +36,7 @@
</div>
{{/foreach}}
<div class="clear"></div>
{{else}}
{{else}}
<table id="cloud-index">
<tr>
<th width="1%"></th>
@ -80,5 +80,5 @@
{{/foreach}}
</table>
{{/if}}
{{/if}}
</div>