Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[49664] branches/12.x
|
From: <xa...@us...> - 2014-01-31 16:47:50
|
Revision: 49664
http://sourceforge.net/p/tikiwiki/code/49664
Author: xavidp
Date: 2014-01-31 16:47:46 +0000 (Fri, 31 Jan 2014)
Log Message:
-----------
[bp/r49068]Usability FIX, in fact, for all profiles from the Profiles Wizard:'[ENH]When installing a Featured Site Profile from the Config Wizards page, you don't need to choose the same profile twice anymore'. Thanks alain_desilets
Revision Links:
--------------
http://sourceforge.net/p/tikiwiki/code/49068
Modified Paths:
--------------
branches/12.x/admin/include_profiles.php
branches/12.x/templates/admin/include_profiles.tpl
branches/12.x/templates/wizard/admin_profiles_demo.tpl
branches/12.x/templates/wizard/admin_profiles_featured.tpl
branches/12.x/templates/wizard/admin_profiles_useful.tpl
Modified: branches/12.x/admin/include_profiles.php
===================================================================
--- branches/12.x/admin/include_profiles.php 2014-01-31 16:14:04 UTC (rev 49663)
+++ branches/12.x/admin/include_profiles.php 2014-01-31 16:47:46 UTC (rev 49664)
@@ -15,6 +15,12 @@
$parserlib = TikiLib::lib('parser');
+$show_details_for = "";
+if (isset($_REQUEST['show_details_for'])) {
+ $show_details_for = $_REQUEST['show_details_for'];
+}
+$smarty->assign('show_details_for', $show_details_for);
+
if ($prefs['profile_unapproved'] == 'y') {
Tiki_Profile::enableDeveloperMode();
}
Modified: branches/12.x/templates/admin/include_profiles.tpl
===================================================================
--- branches/12.x/templates/admin/include_profiles.tpl 2014-01-31 16:14:04 UTC (rev 49663)
+++ branches/12.x/templates/admin/include_profiles.tpl 2014-01-31 16:47:46 UTC (rev 49664)
@@ -347,7 +347,15 @@
</tr>
{foreach key=k item=profile from=$result}
<tr id="profile-{$k}">
- <td><a href="javascript:showDetails( 'profile-{$k}', '{$profile.domain|escape}', '{$profile.name|escape}' )">{$profile.name|escape}</a>{if $profile.installed} <em>{tr}applied{/tr}</em>{/if}</td>
+ {if $profile.name == $show_details_for}
+ {assign var="show_details_for_profile_num" value="$k"}
+ {assign var="show_details_for_fullname" value=$profile.name|escape}
+ {assign var="show_details_for_domain" value=$profile.domain|escape}
+ <td>{$profile.name|escape}: {tr}See profile info below (may take a few seconds to load){/tr}.</td>
+ {else}
+ <td><a href="javascript:showDetails( 'profile-{$k}', '{$profile.domain|escape}', '{$profile.name|escape}' )">{$profile.name|escape}</a>{if $profile.installed} <em>{tr}applied{/tr}</em>{/if}</td>
+ {/if}
+
<td>{$profile.domain}</td>
<td>{$profile.categoriesString}</td>
</tr>
@@ -356,6 +364,9 @@
<tr><td colspan="3" class="odd">{tr}None{/tr}</td></tr>
{/if}
</table>
+ {if $show_details_for_profile_num != ""}
+ {jq}showDetails('profile-{{$show_details_for_profile_num}}', '{{$show_details_for_domain}}', '{{$show_details_for_fullname}}');{/jq}
+ {/if}
{/if}
</fieldset>
Modified: branches/12.x/templates/wizard/admin_profiles_demo.tpl
===================================================================
--- branches/12.x/templates/wizard/admin_profiles_demo.tpl 2014-01-31 16:14:04 UTC (rev 49663)
+++ branches/12.x/templates/wizard/admin_profiles_demo.tpl 2014-01-31 16:47:46 UTC (rev 49664)
@@ -11,7 +11,7 @@
<tr>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_bug_tracker48x48.png" alt="{tr}Bug Tracker{/tr}" /></div>
- <b>{tr}Bug Tracker{/tr}</b> (<a href="tiki-admin.php?profile=Bug_Tracker&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Bug Tracker{/tr}</b> (<a href="tiki-admin.php?profile=Bug_Tracker&show_details_for=Bug_Tracker&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}This profile allows you to see a tracker in action with some demo data, and a custom interface in a wiki page to add new items, as well as having them listed for you below.{/tr}
<ul>
@@ -26,7 +26,7 @@
</td>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_dynamic_items_list48x48.png" alt="{tr}Dynamic Items List{/tr}" /></div>
- <b>{tr}Dynamic Items List{/tr}</b> (<a href="tiki-admin.php?profile=Dynamic_items_list_demo&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)<br/>
+ <b>{tr}Dynamic Items List{/tr}</b> (<a href="tiki-admin.php?profile=Dynamic_items_list_demo&show_details_for=Dynamic_items_list_demo&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)<br/>
<br>
{tr}This profile creates two linked trackers. One that allow pre-selecting the items in a drop down list based on the items in a previous drop down field. And a second tracker that holds the options displayed in the drop down fields.{/tr}
<ul>
@@ -41,7 +41,7 @@
<tr>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_tracker_as_calendar48x48.png" alt="{tr}Tracker as Calendar{/tr}" /></div>
- <b>{tr}Tracker as Calendar{/tr}</b> (<a href="tiki-admin.php?profile=Tracker_as_Calendar_10&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Tracker as Calendar{/tr}</b> (<a href="tiki-admin.php?profile=Tracker_as_Calendar_10&show_details_for=Tracker_as_Calendar_10&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}This profile creates a tracker with some demo data and wiki interface that will be used to display and manage a Calendar of events in a fancy visual way.{/tr}
<ul>
@@ -57,7 +57,7 @@
</td>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_voting_system48x48.png" alt="{tr}Voting System{/tr}" /></div>
- <b>{tr}Voting System{/tr}</b> (<a href="tiki-admin.php?profile=Voting_System&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Voting System{/tr}</b> (<a href="tiki-admin.php?profile=Voting_System&show_details_for=Voting_System&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}This profile sets up a Voting system in which only members of a group will be able to vote. It creates a tracker, 2 groups of users, one user in each group and a custom wiki page as interface to vote{/tr}.
<ul>
Modified: branches/12.x/templates/wizard/admin_profiles_featured.tpl
===================================================================
--- branches/12.x/templates/wizard/admin_profiles_featured.tpl 2014-01-31 16:14:04 UTC (rev 49663)
+++ branches/12.x/templates/wizard/admin_profiles_featured.tpl 2014-01-31 16:47:46 UTC (rev 49664)
@@ -9,7 +9,7 @@
<tr>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_collaborative_community48x48.png" alt="{tr}Collaborative Community{/tr}" /></div>
- <b>{tr}Collaborative Community{/tr}</b> (<a href="tiki-admin.php?profile=Collaborative_Community_12x&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Collaborative Community{/tr}</b> (<a href="tiki-admin.php?profile=Collaborative_Community_12x&show_details_for=Collaborative_Community_12x&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}Setup to help subject experts and enthusiasts work together to build a Knowledge Base{/tr}
<ul>
@@ -24,7 +24,7 @@
</td>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_company_intranet48x48.png" alt="{tr}Company Intranet{/tr}" /></div>
- <b>{tr}Company Intranet{/tr}</b> (<a href="tiki-admin.php?profile=Company_Intranet_12x&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Company Intranet{/tr}</b> (<a href="tiki-admin.php?profile=Company_Intranet_12x&show_details_for=Company_Intranet_12x&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}Setup for a Corporate Intranet of a typical medium-sized business{/tr}.
<ul>
@@ -38,7 +38,7 @@
<tr>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_personal_blog_and_profile48x48.png" alt="{tr}Personal Blog and Profile{/tr}" /></div>
- <b>{tr}Personal Blog and Profile{/tr}</b> (<a href="tiki-admin.php?profile=Personal_Blog_and_Profile_12x&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Personal Blog and Profile{/tr}</b> (<a href="tiki-admin.php?profile=Personal_Blog_and_Profile_12x&show_details_for=Personal_Blog_and_Profile_12x&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}Setup with many cool features to help you integrate the Social Web and establish a strong presence in the Blogosphere{/tr}
<ul>
@@ -53,7 +53,7 @@
</td>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_small_org_web_presence48x48.png" alt="{tr}Small Organization Web Presence{/tr}" /></div>
- <b>{tr}Small Organization Web Presence{/tr}</b> (<a href="tiki-admin.php?profile=Small_Organization_Web_Presence_12x&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Small Organization Web Presence{/tr}</b> (<a href="tiki-admin.php?profile=Small_Organization_Web_Presence_12x&show_details_for=Small_Organization_Web_Presence_12x&categories%5B%5D=12.x&categories%5B%5D=Featured+profiles&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}Setup for a Web Presence of a typical small business or non-profit{/tr}.
<ul>
Modified: branches/12.x/templates/wizard/admin_profiles_useful.tpl
===================================================================
--- branches/12.x/templates/wizard/admin_profiles_useful.tpl 2014-01-31 16:14:04 UTC (rev 49663)
+++ branches/12.x/templates/wizard/admin_profiles_useful.tpl 2014-01-31 16:47:46 UTC (rev 49664)
@@ -9,7 +9,7 @@
<tr>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_mobile48x48.png" alt="{tr}Mobile{/tr}" /></div>
- <b>{tr}Mobile{/tr}</b> (<a href="tiki-admin.php?profile=Mobile&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Mobile{/tr}</b> (<a href="tiki-admin.php?profile=Mobile&show_details_for=Mobile&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}This profile allows to switch the site layout, text and icons to users with smartphones and tablets{/tr}
<ul>
@@ -24,8 +24,8 @@
</td>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_debug_mode48x48.png" alt="{tr}Debug Mode Enabled{/tr}" /></div>
- <b>{tr}Debug Mode Enabled{/tr}</b> (<a href="tiki-admin.php?profile=Debug_Mode_Enabled&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)<br/>
- <b>{tr}Debug Mode Disabled{/tr}</b> (<a href="tiki-admin.php?profile=Debug_Mode_Disabled&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Debug Mode Enabled{/tr}</b> (<a href="tiki-admin.php?profile=Debug_Mode_Enabled&show_details_for=Debug_Mode_Enabled&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)<br/>
+ <b>{tr}Debug Mode Disabled{/tr}</b> (<a href="tiki-admin.php?profile=Debug_Mode_Disabled&show_details_for=Debug_Mode_Disabled&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}Profile <i>Debug_Mode_Enabled</i> will help you detect potential errors and warnings which are hidden otherwise.{/tr}
{tr}Once applied, you might like to apply the opposite profile: <i>Debug_Mode_Disabled</i>, if not changing the appropriate settings by hand.{/tr}
@@ -41,7 +41,7 @@
<tr>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_together48x48.png" alt="{tr}Together{/tr}" /></div>
- <b>{tr}Together{/tr}</b> (<a href="tiki-admin.php?profile=Together&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Together{/tr}</b> (<a href="tiki-admin.php?profile=Together&show_details_for=Together&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}This profile adds a simple wiki page on a side module (using the Module menupage), showing the button to start co-writing with TogetherJS.{/tr}
<ul>
@@ -56,7 +56,7 @@
</td>
<td style="width:48%">
<div class="adminWizardIconright"><img src="img/icons/large/profile_timesheet48x48.png" alt="{tr}Timesheet{/tr}" /></div>
- <b>{tr}Timesheet{/tr}</b> (<a href="tiki-admin.php?profile=Time_Sheet&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
+ <b>{tr}Timesheet{/tr}</b> (<a href="tiki-admin.php?profile=Time_Sheet&show_details_for=Time_Sheet&categories%5B%5D=12.x&repository=http%3a%2f%2fprofiles.tiki.org%2fprofiles&page=profiles&preloadlist=y&list=List#step2" target="_blank">{tr}apply profile now{/tr}</a>)
<br>
{tr}This profile allows recording time spent on projects. It creates two trackers: one to hold the time spent, and the other with the project names. Both trackers are linked, so that project names can be chosen when entering items to the timesheet tracker{/tr}.
<ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|