fixes #462 - last saved time now shows on all articles/pages

pencilblue · Apr 25, 2015 · 00caae0 · 00caae0
1 parent b0126da
commit 00caae0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/plugins/pencilblue/templates/admin/content/articles/article_form.html b/plugins/pencilblue/templates/admin/content/articles/article_form.html
@@ -123,7 +123,11 @@
 					</ul>
 				</div>
 				<div class="spacer"></div>
-				<label id="draft_info" ng-if="article.draft && article._id">^loc_DRAFT_SAVED^ <span id="draft_time">{{article.last_modified | date: 'yyyy-MM-dd HH:mm:ss'}}</span></label>
+				<label id="draft_info" ng-if="article._id">
+					<span ng-if="article.draft">^loc_DRAFT_SAVED^</span>
+					<span ng-if="!article.draft">^loc_LAST_SAVED^</span>&nbsp;
+					<span id="draft_time">{{article.last_modified | date: 'yyyy-MM-dd HH:mm:ss'}}</span>
+				</label>
 			</div>
 		</fieldset>
 	</form>

diff --git a/plugins/pencilblue/templates/admin/content/pages/page_form.html b/plugins/pencilblue/templates/admin/content/pages/page_form.html
@@ -8,7 +8,7 @@
             <div class="tab-content">
                 <div class="tab-pane active" id="content">
                     <div class="form-group" ng-class="{'has-error': !isFieldValid(pageForm.url)}">
-                        <label>^loc_ARTICLE_URL^</label>
+                        <label>^loc_PAGE_URL^</label>
                         <div class="input-group">
                             <span class="input-group-addon">/page/</span>
                             <input type="text" name="url" class="form-control" placeholder="^loc_CUSTOM_URL^" ng-model="page.url" ng-change="resetUrlAvailability()" url-safe required></input>
@@ -113,7 +113,11 @@
                     </ul>
                 </div>
                 <div class="spacer"></div>
-                <label id="draft_info" ng-if="page.draft">^loc_DRAFT_SAVED^ <span id="draft_time">{{page.last_modified | date: 'yyyy-MM-dd HH:mm:ss'}}</span></label>
+                <label id="draft_info" ng-if="page._id">
+                  <span ng-if="page.draft">^loc_DRAFT_SAVED^</span>
+                  <span ng-if="!page.draft">^loc_LAST_SAVED^</span>&nbsp;
+                  <span id="draft_time">{{page.last_modified | date: 'yyyy-MM-dd HH:mm:ss'}}</span>
+                </label>
             </div>
             <div class="additions" style="display: none"></div>
         </fieldset>

diff --git a/public/localization/de-de.js b/public/localization/de-de.js
@@ -50,6 +50,7 @@ var loc = {
         SAVE: 'Speichern',
         SAVE_DRAFT: 'Entwurf speichern',
         DRAFT_SAVED: 'Entwurd gespeichert',
+        LAST_SAVED: 'Zuletzt gespeichert',
         PREVIEW: 'Vorschau',
         CANCEL: 'Abbruch',
         EDIT: 'Bearbeiten',

diff --git a/public/localization/en-us.js b/public/localization/en-us.js
@@ -37,6 +37,7 @@ var loc =
         SAVE: 'Save',
         SAVE_DRAFT: 'Save draft',
         DRAFT_SAVED: 'Draft saved',
+        LAST_SAVED: 'Last saved',
         PREVIEW: 'Preview',
         CANCEL: 'Cancel',
         EDIT: 'Edit',

diff --git a/public/localization/pl-pl.js b/public/localization/pl-pl.js
@@ -46,6 +46,7 @@ var loc =
         SAVE: 'Zapisz',
         SAVE_DRAFT: 'Zapisz projekt',
         DRAFT_SAVED: 'Projekt zapisany',
+        LAST_SAVED: 'Ostatnio zapisany',
         PREVIEW: 'Podgląd',
         CANCEL: 'Anuluj',
         EDIT: 'Edytuj',

diff --git a/public/localization/ro-ro.js b/public/localization/ro-ro.js
@@ -37,6 +37,7 @@ var loc =
         SAVE: 'Salveaza',
         SAVE_DRAFT: 'Salveaza draft',
         DRAFT_SAVED: 'Draft salvat',
+        LAST_SAVED: 'Ultima salvat',
         PREVIEW: 'Preview',
         CANCEL: 'Anuleaza',
         EDIT: 'Editeaza',