From: <li...@us...> - 2015-10-05 01:47:35
|
Revision: 56417 http://sourceforge.net/p/tikiwiki/code/56417 Author: lindonb Date: 2015-10-05 01:47:32 +0000 (Mon, 05 Oct 2015) Log Message: ----------- [MRG] Automatic merge, branches/14.x 56411 to 56416 Modified Paths: -------------- trunk/lib/wiki-plugins/wikiplugin_article.php trunk/lib/wiki-plugins/wikiplugin_articles.php trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php trunk/themes/base_files/iconsets/default.php Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2015-10-05 01:46:12 UTC (rev 56416) +++ trunk 2015-10-05 01:47:32 UTC (rev 56417) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -2,7 +2,7 ## /branches/11.x:45702-47762 /branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301 /branches/13.x:51407-53060,53145,53192,53882 -/branches/14.x:54079-56411 +/branches/14.x:54079-56416 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property Modified: trunk/lib/wiki-plugins/wikiplugin_article.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_article.php 2015-10-05 01:46:12 UTC (rev 56416) +++ trunk/lib/wiki-plugins/wikiplugin_article.php 2015-10-05 01:47:32 UTC (rev 56417) @@ -12,7 +12,7 @@ 'documentation' => 'PluginArticle', 'description' => tra('Display a field of an article'), 'prefs' => array( 'feature_articles', 'wikiplugin_article' ), - 'iconname' => 'article', + 'iconname' => 'articles', 'format' => 'html', 'introduced' => 1, 'params' => array( Modified: trunk/lib/wiki-plugins/wikiplugin_articles.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_articles.php 2015-10-05 01:46:12 UTC (rev 56416) +++ trunk/lib/wiki-plugins/wikiplugin_articles.php 2015-10-05 01:47:32 UTC (rev 56417) @@ -13,7 +13,7 @@ 'documentation' => 'PluginArticles', 'description' => tra('Display multiple articles'), 'prefs' => array( 'feature_articles', 'wikiplugin_articles' ), - 'iconname' => 'article', + 'iconname' => 'articles', 'tags' => array( 'basic' ), 'introduced' => 1, 'params' => array( Modified: trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php 2015-10-05 01:46:12 UTC (rev 56416) +++ trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php 2015-10-05 01:47:32 UTC (rev 56417) @@ -13,7 +13,7 @@ 'description' => tra('Allow users to subscribe to a newsletter'), 'prefs' => array('feature_newsletters', 'wikiplugin_subscribenewsletter'), 'body' => tra('Invitation message'), - 'iconname' => 'article', + 'iconname' => 'articles', 'introduced' => 5, 'tags' => array( 'basic' ), 'params' => array( Modified: trunk/themes/base_files/iconsets/default.php =================================================================== --- trunk/themes/base_files/iconsets/default.php 2015-10-05 01:46:12 UTC (rev 56416) +++ trunk/themes/base_files/iconsets/default.php 2015-10-05 01:47:32 UTC (rev 56417) @@ -194,7 +194,13 @@ 'id' => 'step-backward', ), //ban in defaults + 'box' => array( + 'id' => 'list-alt', + ), //caret-left & caret-right in defaults + 'cart' => array( + 'id' => 'shopping-cart', + ), 'chart' => array( 'id' => 'area-chart', ), @@ -214,6 +220,9 @@ 'compose' => array( 'id' => 'pencil', ), + 'computer' => array( + 'id' => 'desktop', + ), 'contacts' => array( 'id' => 'group', ), @@ -237,6 +246,9 @@ 'id' => 'sort-desc', ), //edit in defaults + 'education' => array( + 'id' => 'graduation-cap', + ), 'envelope' => array( 'id' => 'envelope-o', ), @@ -295,6 +307,9 @@ 'id' => 'external-link', ), //list in defaults + 'list-numbered' => array( + 'id' => 'list-ol', + ), //lock in defaults //same fa icon used for admin_security, but not the same in other icon sets 'log' => array( @@ -309,6 +324,9 @@ 'mailbox' => array( 'id' => 'inbox', ), + 'map' => array( + 'id' => 'map-marker', + ), 'menu' => array( 'id' => 'bars', ), @@ -367,6 +385,9 @@ 'id' => 'arrow-left', ), //print in defaults + 'quotes' => array( + 'id' => 'quote-left', + ), 'ranking' => array( 'id' => 'sort-numeric-asc', ), @@ -451,6 +472,9 @@ 'id' => 'trash-o', ), //twitter in defaults + 'tv' => array( + 'id' => 'desktop', + ), //undo in defaults //unlock in defaults 'up' => array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |