Showing
3 changed files
with
9 additions
and
9 deletions
| ... | @@ -40,7 +40,7 @@ class AttachmentController extends Controller | ... | @@ -40,7 +40,7 @@ class AttachmentController extends Controller |
| 40 | ]); | 40 | ]); |
| 41 | 41 | ||
| 42 | $pageId = $request->get('uploaded_to'); | 42 | $pageId = $request->get('uploaded_to'); |
| 43 | - $page = $this->pageRepo->getById($pageId); | 43 | + $page = $this->pageRepo->getById($pageId, true); |
| 44 | 44 | ||
| 45 | $this->checkPermission('attachment-create-all'); | 45 | $this->checkPermission('attachment-create-all'); |
| 46 | $this->checkOwnablePermission('page-update', $page); | 46 | $this->checkOwnablePermission('page-update', $page); |
| ... | @@ -70,7 +70,7 @@ class AttachmentController extends Controller | ... | @@ -70,7 +70,7 @@ class AttachmentController extends Controller |
| 70 | ]); | 70 | ]); |
| 71 | 71 | ||
| 72 | $pageId = $request->get('uploaded_to'); | 72 | $pageId = $request->get('uploaded_to'); |
| 73 | - $page = $this->pageRepo->getById($pageId); | 73 | + $page = $this->pageRepo->getById($pageId, true); |
| 74 | $attachment = $this->attachment->findOrFail($attachmentId); | 74 | $attachment = $this->attachment->findOrFail($attachmentId); |
| 75 | 75 | ||
| 76 | $this->checkOwnablePermission('page-update', $page); | 76 | $this->checkOwnablePermission('page-update', $page); |
| ... | @@ -106,7 +106,7 @@ class AttachmentController extends Controller | ... | @@ -106,7 +106,7 @@ class AttachmentController extends Controller |
| 106 | ]); | 106 | ]); |
| 107 | 107 | ||
| 108 | $pageId = $request->get('uploaded_to'); | 108 | $pageId = $request->get('uploaded_to'); |
| 109 | - $page = $this->pageRepo->getById($pageId); | 109 | + $page = $this->pageRepo->getById($pageId, true); |
| 110 | $attachment = $this->attachment->findOrFail($attachmentId); | 110 | $attachment = $this->attachment->findOrFail($attachmentId); |
| 111 | 111 | ||
| 112 | $this->checkOwnablePermission('page-update', $page); | 112 | $this->checkOwnablePermission('page-update', $page); |
| ... | @@ -134,7 +134,7 @@ class AttachmentController extends Controller | ... | @@ -134,7 +134,7 @@ class AttachmentController extends Controller |
| 134 | ]); | 134 | ]); |
| 135 | 135 | ||
| 136 | $pageId = $request->get('uploaded_to'); | 136 | $pageId = $request->get('uploaded_to'); |
| 137 | - $page = $this->pageRepo->getById($pageId); | 137 | + $page = $this->pageRepo->getById($pageId, true); |
| 138 | 138 | ||
| 139 | $this->checkPermission('attachment-create-all'); | 139 | $this->checkPermission('attachment-create-all'); |
| 140 | $this->checkOwnablePermission('page-update', $page); | 140 | $this->checkOwnablePermission('page-update', $page); |
| ... | @@ -153,9 +153,9 @@ class AttachmentController extends Controller | ... | @@ -153,9 +153,9 @@ class AttachmentController extends Controller |
| 153 | */ | 153 | */ |
| 154 | public function listForPage($pageId) | 154 | public function listForPage($pageId) |
| 155 | { | 155 | { |
| 156 | - $page = $this->pageRepo->getById($pageId); | 156 | + $page = $this->pageRepo->getById($pageId, true); |
| 157 | $this->checkOwnablePermission('page-view', $page); | 157 | $this->checkOwnablePermission('page-view', $page); |
| 158 | - return response()->json($page->files); | 158 | + return response()->json($page->attachments); |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | /** | 161 | /** | ... | ... |
| ... | @@ -193,7 +193,7 @@ p.neg, p .neg, span.neg, .text-neg { | ... | @@ -193,7 +193,7 @@ p.neg, p .neg, span.neg, .text-neg { |
| 193 | p.muted, p .muted, span.muted, .text-muted { | 193 | p.muted, p .muted, span.muted, .text-muted { |
| 194 | color: lighten($text-dark, 26%); | 194 | color: lighten($text-dark, 26%); |
| 195 | &.small, .small { | 195 | &.small, .small { |
| 196 | - color: lighten($text-dark, 42%); | 196 | + color: lighten($text-dark, 32%); |
| 197 | } | 197 | } |
| 198 | } | 198 | } |
| 199 | 199 | ... | ... |
| ... | @@ -43,11 +43,11 @@ | ... | @@ -43,11 +43,11 @@ |
| 43 | <div class="padded files"> | 43 | <div class="padded files"> |
| 44 | 44 | ||
| 45 | <div id="file-list" ng-show="!editFile"> | 45 | <div id="file-list" ng-show="!editFile"> |
| 46 | - <p class="muted small">Upload some files or attach some link to display on your page. This are visible in the page sidebar.</p> | 46 | + <p class="muted small">Upload some files or attach some link to display on your page. These are visible in the page sidebar. <span class="secondary">Changes here are saved instantly.</span></p> |
| 47 | 47 | ||
| 48 | <div tab-container> | 48 | <div tab-container> |
| 49 | <div class="nav-tabs"> | 49 | <div class="nav-tabs"> |
| 50 | - <div tab-button="list" class="tab-item">File List</div> | 50 | + <div tab-button="list" class="tab-item">Attached Items</div> |
| 51 | <div tab-button="file" class="tab-item">Upload File</div> | 51 | <div tab-button="file" class="tab-item">Upload File</div> |
| 52 | <div tab-button="link" class="tab-item">Attach Link</div> | 52 | <div tab-button="link" class="tab-item">Attach Link</div> |
| 53 | </div> | 53 | </div> | ... | ... |
-
Please register or sign in to post a comment