Changeset [6c0cbf3e675f255e216148bdcc688ae0c943cde5] by dleffler

Revision 6c0cbf3e675f255e216148bdcc688ae0c943cde5, committed by dleffler · March 17th, 2012 @ 03:20 AM

Changes 'merged' indicator to merge command to 'import' merged/aggregated content [#525 state:resolved]
https://github.com/exponentcms/exponent-cms/commit/6c0cbf3e675f255e...

37 changed files

R framework/modules/text/views/text/showall_merge.tpl
M framework/core/assets/css/admin-global.css
M framework/core/controllers/expController.php
M framework/core/subsystems/expString.php
M framework/modules/blog/views/blog/show.tpl
M framework/modules/blog/views/blog/showall.tpl
M framework/modules/blog/views/blog/showall_headlines.tpl
M framework/modules/blog/views/blog/showall_recent.tpl
M framework/modules/faq/views/faq/showall.tpl
M framework/modules/filedownloads/views/filedownload/filedownloaditem.tpl
M framework/modules/filedownloads/views/filedownload/show.tpl
M framework/modules/help/views/help/show.tpl
M framework/modules/help/views/help/showall.tpl
M framework/modules/links/views/links/showall.tpl
M framework/modules/links/views/links/showall_quicklinks.tpl
M framework/modules/motd/views/motd/show.tpl
M framework/modules/motd/views/motd/showall.tpl
M framework/modules/news/views/news/show.tpl
M framework/modules/news/views/news/showExpired.tpl
M framework/modules/news/views/news/showUnpublished.tpl
M framework/modules/news/views/news/showall.tpl
M framework/modules/news/views/news/showall_headlines.tpl
M framework/modules/news/views/news/showall_recent.tpl
M framework/modules/photoalbum/views/photo/show.tpl
M framework/modules/photoalbum/views/photo/showall.tpl
M framework/modules/photoalbum/views/photo/showall_galleries.tpl
M framework/modules/photoalbum/views/photo/slideshow.tpl
M framework/modules/portfolio/views/portfolio/portfolioitem.tpl
M framework/modules/portfolio/views/portfolio/show.tpl
M framework/modules/portfolio/views/portfolio/slideshow.tpl
M framework/modules/snippet/views/snippet/highlight.tpl
M framework/modules/snippet/views/snippet/showall.tpl
M framework/modules/text/views/text/showRandom.tpl
M framework/modules/text/views/text/showall.tpl
M framework/modules/text/views/text/showall_tabview.tpl
M framework/modules/text/views/text/single.tpl
M framework/modules/youtube/views/youtube/showall.tpl