Skip to content

Commit

Permalink
Merge branch 'dleffler-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@illiphilli
illiphilli committed Mar 10, 2011
2 parents 0a19ff5 + 31684ce commit 028c9b2
Show file tree
Hide file tree
Showing 17 changed files with 119 additions and 73 deletions.
11 changes: 8 additions & 3 deletions conf/data/date_format.dropdown
View file
Expand Up @@ -27,14 +27,20 @@
November 1, 2010

%D
11/01/04
11/01/10

%b %d %Y
Nov 01 2004
Nov 01 2010

%b %d, %Y
Nov 01, 2010

%a %b %d %Y
Mon Nov 01 2010

%a, %b %d, %Y
Mon, Nov 01, 2010

%d.%m.%y
01.11.10

Expand All @@ -52,4 +58,3 @@

%d/%m/%Y
01/11/2010

19 changes: 12 additions & 7 deletions conf/data/datetime_format.dropdown
View file
Expand Up @@ -18,20 +18,25 @@
# will put it in the standard distribution.

%A, %B %e, %l:%M%p
Monday, November 1, 2004, 6:45pm
Monday, November 1, 2010, 6:45pm

%B %e, %l:%M%p
November 1, 2004, 6:45pm
November 1, 2010, 6:45pm

%D %T
11/01/04 18:45:00
11/01/10 18:45:00

%D %l:%M%p
11/01/04 6:45pm
11/01/10 6:45pm

%b %d %Y %H:%M
Nov 01 2004 18:45
Nov 01 2010 18:45

%b %d, %Y %H:%M
Nov 01, 2010 18:45

%a %b %d %Y %H:%M
Mon Nov 01 2004 18:45

Mon Nov 01 2010 18:45

%a, %b %d, %Y %H:%M
Mon, Nov 01, 2010 18:45
74 changes: 37 additions & 37 deletions conf/data/start_of_week.dropdown
View file
@@ -1,37 +1,37 @@
# Start of Week Drop Down File
#
# Comments start with a '#' sign,
# and must be the only thing on the line.
#
# Each entry in this file consists of two lines - the
# first line is the octal UNIX permission bits and
# the second is the name of the permissions set,
# which will be provided to the user when configuring.
#
# If you add entries to this file, I ask that you let me
# know, through our Sourceforge page. If you want or need
# a mode that isn't listed here, and you tell me, I
# will put it in the standard distribution.
# The group options were added by Ballsacian1, 11/30/06.
0
Sunday
1
Monday
2
Tuesday
3
Wednesday
4
Thursday
5
Friday
6
Saturday
# Start of Week Drop Down File
#
# Comments start with a '#' sign,
# and must be the only thing on the line.
#
# Each entry in this file consists of two lines - the
# first line is the octal UNIX permission bits and
# the second is the name of the permissions set,
# which will be provided to the user when configuring.
#
# If you add entries to this file, I ask that you let me
# know, through our Sourceforge page. If you want or need
# a mode that isn't listed here, and you tell me, I
# will put it in the standard distribution.

# The group options were added by Ballsacian1, 11/30/06.

0
Sunday

1
Monday

2
Tuesday

3
Wednesday

4
Thursday

5
Friday

6
Saturday
10 changes: 9 additions & 1 deletion datatypes/section.php
View file
Expand Up @@ -110,7 +110,9 @@ function moveStandaloneForm($object = null) {
exponent_forms_initialize();

$form = section::_commonForm($object);
// the name and sef_name are already set in the stand-alone page
$form->unregister('name');
$form->unregister('sef_name');

global $db;
$standalones = array();
Expand Down Expand Up @@ -196,6 +198,8 @@ function externalAliasForm($object = null) {
// This has the name and positional dropdowns registered.
// This call also initializes the section object, if it is not an existing section.
$form = section::_commonForm($object);
// do we need an sef_name for an external page?
//$form->unregister('sef_name');

if (!isset($object->external_link)) $object->external_link = '';
// Add a textbox the user can enter the external website's URL into.
Expand Down Expand Up @@ -239,6 +243,8 @@ function internalAliasForm($object = null) {
// This has the name and positional dropdowns registered.
// This call also initializes the section object, if it is not an existing section.
$form = section::_commonForm($object);
// the sef_name is already set in this existing page
$form->unregister('sef_name');

// Add a dropdown to allow the user to choose an internal page.
$form->register('internal_id',$i18n['internal_link'],new dropdowncontrol($object->internal_id,navigationmodule::levelDropDownControlArray(0,0)));
Expand Down Expand Up @@ -312,7 +318,7 @@ function pagesetForm($object = null) {
*/
function _updateCommon($values,$object) {
$object->name = $values['name'];
$object->sef_name = $values['sef_name'];
if (isset($values['sef_name'])) $object->sef_name = $values['sef_name'];
if (isset($values['rank'])) $object->rank = $values['rank'];
if (isset($values['parent'])) $object->parent = $values['parent'];
$object->new_window = (isset($values['new_window']) ? 1 : 0);
Expand Down Expand Up @@ -401,6 +407,8 @@ function updateInternalAlias($values,$object) {
// expected to catch this if a link to an inactive section is made, and that behaviour
// is undesired.
$object->active = $section->active;
// Set the sef_name the new section from the linked section.
$object->sef_name = $section->sef_name;
return $object;
}

Expand Down
4 changes: 4 additions & 0 deletions framework/modules/administration/controllers/administrationController.php
View file
Expand Up @@ -166,6 +166,9 @@ public function configure_site () {
// Time Format
$time_format = exponent_config_dropdownData('time_format');

// Start of Week
$start_of_week = exponent_config_dropdownData('start_of_week');

// File Permissions
$file_permisions = exponent_config_dropdownData('file_permissions');

Expand All @@ -181,6 +184,7 @@ public function configure_site () {
'attribution'=>$attribution,
'date_format'=>$date_format,
'time_format'=>$time_format,
'start_of_week'=>$start_of_week,
'file_permisions'=>$file_permisions,
'dir_permissions'=>$dir_permissions,
'section_dropdown'=>$section_dropdown
Expand Down
6 changes: 3 additions & 3 deletions framework/modules/administration/menus/admin.php
View file
Expand Up @@ -35,23 +35,23 @@
'id'=>'configure',
'itemdata'=>array(
array(
'text'=>"Configure Site",
'text'=>"Configure Website",
'url'=>makeLink(array('module'=>'administration','action'=>'configure_site')),
),
array(
'text'=>$i18n['upload_extension'],
'url'=>makeLink(array('module'=>'administrationmodule','action'=>'upload_extension')),
),
array(
'text'=>expLang::gettext('Manage Active Modules'),
'text'=>expLang::gettext('Manage Modules'),
'url'=>makeLink(array('controller'=>'expModule','action'=>'manage')),
),
array(
'text'=>$i18n['manage_themes'],
'url'=>makeLink(array('module'=>'administrationmodule','action'=>'managethemes')),
),
array(
'text'=>'Spider Site',
'text'=>'Regenerate Search Index',
'url'=>makeLink(array('module'=>'search','action'=>'spider')),
),
array(
Expand Down
14 changes: 7 additions & 7 deletions framework/modules/administration/menus/ecomm.php
View file
Expand Up @@ -51,15 +51,15 @@
'id'=>'store',
'itemdata'=>array(
array(
'text'=>"General Store Settings",
'text'=>"Store Configuration",
'url'=>makeLink(array('controller'=>'ecomconfig','action'=>'configure')),
),
array(
'text'=>"Manage Status Codes",
'url'=>makeLink(array('controller'=>'order_status','action'=>'manage')),
),
array(
'text'=>"Manage Status Messages",
'text'=>"Manage Order Status Messages",
'url'=>makeLink(array('controller'=>'order_status','action'=>'manage_messages')),
),
array(
Expand All @@ -83,31 +83,31 @@
'url'=>makeLink(array('controller'=>'store','action'=>'manage')),
),
array(
'text'=>"Product Options",
'text'=>"Manage Product Options",
'url'=>makeLink(array('controller'=>'ecomconfig','action'=>'options')),
),
array(
'text'=>"Manage Store Categories",
'url'=>makeLink(array('controller'=>'storeCategoryController','action'=>'manage')),
),
array(
'text'=>"View Uncategories Products",
'text'=>"View Uncategorized Products",
'url'=>makeLink(array('controller'=>'store','action'=>'showallUncategorized')),
),
),
),
),
array(
'text'=>"Payments & Shipping Settings",
'text'=>"Payment & Shipping Settings",
'submenu'=>array(
'id'=>'pay',
'itemdata'=>array(
array(
'text'=>"Payment Options",
'text'=>"Manage Payment Options",
'url'=>makeLink(array('controller'=>'billing','action'=>'manage')),
),
array(
'text'=>"Shipping Options",
'text'=>"Manage Shipping Options",
'url'=>makeLink(array('controller'=>'shipping','action'=>'manage')),
),
),
Expand Down
11 changes: 10 additions & 1 deletion framework/modules/administration/views/administration/configure_site.tpl
View file
Expand Up @@ -42,6 +42,7 @@
<li><a href="#tab8"><em>{gettext str="Security Settings"}</em></a></li>
<li><a href="#tab9"><em>{gettext str="Help Settings"}</em></a></li>
<li><a href="#tab10"><em>{gettext str="HTML Editor Settings"}</em></a></li>
<li><a href="#tab10"><em>{gettext str="Error Messages"}</em></a></li>
{/if}
</ul>
<div class="yui-content">
Expand Down Expand Up @@ -83,6 +84,7 @@
{control type="dropdown" name="sc[DISPLAY_ATTRIBUTION]" label="Attribution Display" items=$attribution default=$smarty.const.DISPLAY_ATTRIBUTION}
{control type="dropdown" name="sc[DISPLAY_DATE_FORMAT]" label="Date Format" items=$date_format default=$smarty.const.DISPLAY_DATE_FORMAT}
{control type="dropdown" name="sc[DISPLAY_TIME_FORMAT]" label="Time Format" items=$time_format default=$smarty.const.DISPLAY_TIME_FORMAT}
{control type="dropdown" name="sc[DISPLAY_START_OF_WEEK]" label="Start of Week" items=$start_of_week default=$smarty.const.DISPLAY_START_OF_WEEK}
{control type="text" name="sc[DISPLAY_DEFAULT_TIMEZONE]" label="Enter the default timezone for this site. CAUTION: This may break calendars and other features that use date functions if you change this after entering data. Must be in a format shown here: <a href='http://www.php.net/manual/en/timezones.php' target='_blank'>http://www.php.net/manual/en/timezones.php</a>" value=$smarty.const.DISPLAY_DEFAULT_TIMEZONE}
</div>
{if $user->is_admin==1}
Expand Down Expand Up @@ -116,10 +118,17 @@
{control type="checkbox" postfalse=1 name="sc[HELP_ACTIVE]" label="Enable Help links for documentation?" checked=$smarty.const.HELP_ACTIVE value=1}
{control type="text" name="sc[HELP_URL]" label="URL For Help Documentation" value=$smarty.const.HELP_URL}
</div>
<div id="tab9">
<div id="tab10">
<h2>{gettext str="HTML Editor Settings"}</h2>
{control type="dropdown" name="sc[SITE_WYSIWYG_EDITOR]" label="HTML Editor" items="CKEditor,FCK Editor" values="ckeditor,FCKeditor" default=$smarty.const.SITE_WYSIWYG_EDITOR}
</div>
<div id="tab11">
<h2>{gettext str="Error Messages"}</h2>
{control type="text" name="sc[SITE_404_TITLE]" label="Page Title For 'Not Found' (404) Error" value=$smarty.const.SITE_404_TITLE}
{control type="html" name="sc[SITE_404_HTML]" label="'Not Found' (404) Error Message" value=$smarty.const.SITE_404_HTML}
{control type="html" name="sc[SITE_403_REAL_HTML]" label="'Access Denied' (403) Error Message" value=$smarty.const.SITE_403_REAL_HTML}
{control type="html" name="sc[SESSION_TIMEOUT_HTML]" label="'Session Expired' Error Message" value=$smarty.const.SESSION_TIMEOUT_HTML}
</div>
{/if}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/ecommerce/views/ecomconfig/configure.tpl
View file
Expand Up @@ -15,7 +15,7 @@
*}

<div id="storeconfig" class="module ecomconfig configure hide exp-skin-tabview">
<h1>Ecommerce Store Configuration</h1>
<h1>Store Configuration</h1>
{script unique="storeconf" yuimodules="tabview, element"}
{literal}
var tabView = new YAHOO.widget.TabView('storetabs');
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/ecommerce/views/order_status/manage.tpl
View file
Expand Up @@ -15,7 +15,7 @@
*}

<div class="modules order_status showall">
<h1>{$moduletitle|default:"Status Administration"}</h1>
<h1>{$moduletitle|default:"Manage Status Codes"}</h1>

<a href="{link action=create}">Create a new status code</a>{br}{br}
<div id="orders">
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/ecommerce/views/order_type/manage.tpl
View file
Expand Up @@ -15,7 +15,7 @@
*}

<div class="modules order_type showall">
<h1>{$moduletitle|default:"Order Type Administration"}</h1>
<h1>{$moduletitle|default:"Manage Order Types"}</h1>

<a href="{link action=create}">Create a new order type</a>{br}{br}
<div id="orders">
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/ecommerce/views/store/picktype.tpl
View file
Expand Up @@ -15,7 +15,7 @@
*}

<div class="module store action">
<h1>{$moduletitle|default:"Select type of product"}</h1>
<h1>{$moduletitle|default:"Add a Product"}</h1>

{form controller=store action=edit}
{control type="hidden" name="id" value=0}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/ecommerce/views/store/showallUncategorized.tpl
View file
Expand Up @@ -15,7 +15,7 @@
*}

<div class="module store showall-uncategorized">
<h1>Uncategories Products</h1>
<h1>Uncategorized Products</h1>
<div id="products">
{$page->links}
<table id="prods" class="exp-skin-table" style="width:95%">
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/ecommerce/views/storeCategory/manage.tpl
View file
Expand Up @@ -20,7 +20,7 @@

<div class="storeCategory manage-categories">
<div class="form_header">
<h1>Manage Categories</h1>
<h1>Manage Store Categories</h1>
<p>This is where you can add, edit and rearrange categories.</p>
</div>
{control type="tagtree" addable="true" id="managecats" name="managecats" controller=storeCategory draggable=true menu=true}
Expand Down

0 comments on commit 028c9b2

Please sign in to comment.