To participate you must create an account on apostrophenow.org. If you have already done so, click Login.
- Timestamp:
- 07/21/10 15:51:42 (22 months ago)
- Author:
- dordille
- Message:
-
Merged various fixes from branch into trunk.
- Location:
- plugins/apostropheBlogPlugin/trunk
- Files:
-
Legend:
- Unmodified
- Added
- Removed
-
- Property svn:mergeinfo changed
| /plugins/apostropheBlogPlugin/branches/1.4 | merged: 1560,1565,1567,1572,1575,1583,1592,1604,1650-1651,1658,1664,1667,1691,1694,1699,1705,1710-1711,1718,1728,1730,1733,1740,1745,1749,1768,1793,1806-1807,1812 | |
-
|
r1746
|
r1816
|
|
| 4 | 4 | |
| 5 | 5 | <div class="a-admin-container <?php echo $sf_params->get('module') ?>"> |
| 6 | | |
| | 6 | |
| 7 | 7 | <?php slot('a-subnav') ?> |
| 8 | 8 | <div class="a-subnav-wrapper blog"> |
| 9 | | <div class="a-subnav-inner"> |
| | 9 | <div class="a-subnav-inner"> |
| 10 | 10 | <ul class="a-admin-action-controls"> |
| 11 | 11 | <li><a href="<?php echo url_for('@a_blog_admin'); ?>" class="a-btn big alt"><?php echo __('View All Posts', array(), 'apostrophe-blog') ?></a></li> |
| 12 | 12 | <?php include_partial('list_actions', array('helper' => $helper)) ?> |
| 13 | 13 | </ul> |
| 14 | | <?php include_partial('aBlogAdmin/form_bar') ?> |
| | 14 | <?php include_partial('aBlogAdmin/form_bar') ?> |
| 15 | 15 | <div class="a-admin-title-sentence"> |
| 16 | 16 | <h3 class="new-item"><?php echo __('You are creating a new post.', array(), 'apostrophe_blog') ?></h3> |
| 17 | | <h3 class="draft-item"><?php echo __('You are working on a draft post.', array(), 'apostrophe_blog') ?></h3> |
| | 17 | <h3 class="draft-item"><?php echo __('You are working on a draft post.', array(), 'apostrophe_blog') ?></h3> |
| 18 | 18 | <h3 class="published-item"><?php echo __('You are editing a published post.', array(), 'apostrophe_blog') ?></h3> |
| 19 | 19 | <span class="flash-message"> <?php echo __('Post Saved at', array(), 'apostrophe_blog') ?></span> |
| 20 | 20 | </div> |
| 21 | | </div> |
| | 21 | </div> |
| 22 | 22 | </div> |
| 23 | 23 | <?php end_slot() ?> |
| 24 | | |
| | 24 | |
| 25 | 25 | <?php include_partial('flashes') ?> |
| 26 | | |
| 27 | | <div class="a-admin-content main"> |
| 28 | | |
| | 26 | |
| | 27 | <div class="a-admin-content main"> |
| | 28 | |
| 29 | 29 | <?php if (0): ?> <?php // We aren't using status messages right now ?> |
| 30 | 30 | <dl id="a-blog-item-status-messages"></dl> |
| 31 | 31 | <?php endif ?> |
| 32 | | |
| | 32 | |
| 33 | 33 | <div id="a-blog-item-title-interface" class="a-blog-item-title-interface"> |
| 34 | 34 | <input type="text" id="a_blog_item_title_interface" value="<?php echo ($a_blog_post->title == 'untitled')? '':$a_blog_post->title ?>" /> |
| … |
… |
|
| 37 | 37 | <li><a href="#" class="a-btn a-save big"><?php echo __('Save', array(), 'apostrophe_blog') ?></a></li> |
| 38 | 38 | <li><a href="#" class="a-btn a-cancel no-label big"><?php echo __('Cancel', array(), 'apostrophe_blog') ?></a></li> |
| 39 | | </ul> |
| 40 | | </div> |
| | 39 | </ul> |
| | 40 | </div> |
| 41 | 41 | |
| 42 | 42 | <div id="a-blog-item-permalink-interface"> |
| 43 | | <h6>Permalink:</h6> |
| | 43 | <h6>Permalink:</h6> |
| 44 | 44 | <div class="a-blog-item-permalink-wrapper url"> |
| 45 | | <span><?php echo aTools::urlForPage($a_blog_post->findBestEngine()->getSlug()).'/' ?></span> |
| | 45 | <span><?php echo aTools::urlForPage($a_blog_post->findBestEngine()->getSlug()).'/' ?><?php echo date('Y/m/d/', strtotime($a_blog_post->getPublishedAt())) ?></span> |
| 46 | 46 | </div> |
| 47 | 47 | <div class="a-blog-item-permalink-wrapper slug"> |
| … |
… |
|
| 50 | 50 | <li><a href="#" class="a-btn a-save mini"><?php echo __('Save', array(), 'apostrophe_blog') ?></a></li> |
| 51 | 51 | <li><a href="#" class="a-btn a-cancel no-label mini"><?php echo __('Cancel', array(), 'apostrophe_blog') ?></a></li> |
| 52 | | </ul> |
| | 52 | </ul> |
| 53 | 53 | </div> |
| 54 | 54 | </div> |
| … |
… |
|
| 65 | 65 | </div> |
| 66 | 66 | </div> |
| 67 | | |
| | 67 | |
| 68 | 68 | <?php if (isset($a_blog_post['updated_at'])): ?> |
| 69 | 69 | <div id="post-last-saved" class="post-updated-at option"> |
| … |
… |
|
| 71 | 71 | <b>Last Saved:</b> |
| 72 | 72 | <span></span> |
| 73 | | </h6> |
| | 73 | </h6> |
| 74 | 74 | </div> |
| 75 | 75 | <?php endif ?> |
| 76 | | |
| | 76 | |
| 77 | 77 | <div class="a-admin-footer"> |
| 78 | 78 | <?php include_partial('form_footer', array('a_blog_post' => $a_blog_post, 'form' => $form, 'configuration' => $configuration)) ?> |
Download in other formats: