Permalink
Browse files

Several minor edits to some phrases

  • Loading branch information...
1 parent 7533098 commit 642a2caea9e9b5916e7b229b76486d26dda6285d @dleffler dleffler committed Mar 14, 2012
@@ -92,21 +92,21 @@ public static function issetTableCache($tablename) {
*/
public static function initialize() {
- // session key may be overridden
- if (!defined('SYS_SESSION_KEY')) {
- /** exdoc
- * @state <b>UNDOCUMENTED</b>
- * @node Undocumented
- */
- define('SYS_SESSION_KEY',PATH_RELATIVE);
- }
+ // session key may be overridden
+ if (!defined('SYS_SESSION_KEY')) {
+ /** exdoc
+ * @state <b>UNDOCUMENTED</b>
+ * @node Undocumented
+ */
+ define('SYS_SESSION_KEY',PATH_RELATIVE);
+ }
- // Name of session cookie may also be overridden
- if (!defined('SYS_SESSION_COOKIE')) {
- define('SYS_SESSION_COOKIE','PHPSESSID');
- }
+ // Name of session cookie may also be overridden
+ if (!defined('SYS_SESSION_COOKIE')) {
+ define('SYS_SESSION_COOKIE','PHPSESSID');
+ }
-// $sessid = '';
+ // $sessid = '';
if (isset($_GET['expid']))
{
$sessid = $_GET['expid'];
@@ -14,5 +14,5 @@
*
*}
-<h2>{'Select whether or not this module can use tags'|gettext}</h2>
+<h2>{'Dis-Allow tags'|gettext}</h2>
{control type=checkbox name=disabletags label="Disable Tags for this module" value=1 checked=$config.disabletags}
@@ -56,13 +56,9 @@
padding-left:175px;
}
-
.containermodule.edit .control label {
float:left;
text-align:right;
width:140px;
padding:0 15px;
}
-
-
-
@@ -216,5 +216,3 @@ a.addmodule:hover{
background:#d9f2d9;
text-decoration:none;
}
-
-
@@ -1,5 +1,5 @@
/**
-* Cintainer Module
+* Container Module
*/
@@ -17,15 +17,11 @@
width:49%;
float:right;
}
-
div.containermodule.main-wrapper {
border-width:0 1px 1px 1px;
padding:0 0 5px 0;
}
-
-
-
/**
* Three Column View
*/
@@ -35,11 +31,9 @@ div.containermodule.main-wrapper {
width:31%;
float:left;
}
-
.containermodule.three-column .col2 {
margin-left:1.5em;
}
-
.containermodule.three-column .col3 {
width:32%;
float:right;
@@ -36,7 +36,7 @@
</div>
<div class="info-header clearfix">
<div class="related-actions">
- {help text="Get Help"|gettext|cat:" "|cat:("Deleting Files"|gettext) module="add-files"}
+ {help text="Get Help"|gettext|cat:" "|cat:("Adding Files"|gettext) module="add-files"}
</div>
<p>{"Select the following files found on the server to add them to the File Manager."|gettext}</p>
</div>
@@ -51,10 +51,10 @@
{/if}
<li style="width:{$config.pa_showall_thumbbox|default:"150"}px;height:{$config.pa_showall_thumbbox|default:"150"}px;">
{if $config.lightbox}
- {if $record->expFile[0]->width >= $record->expFile[0]->height}{assign var=x value="w"}{else}{assign var=x value="w"}{/if}
- <a rel="lightbox[{$name}]" href="{$smarty.const.URL_FULL}thumb.php?id={$record->expFile[0]->id}&{$x}={$config.pa_showall_enlarged}" title="{$record->title|default:$record->expFile[0]->title}">
+ {if $record->expFile[0]->width >= $record->expFile[0]->height}{assign var=x value="w"}{else}{assign var=x value="w"}{/if}
+ <a rel="lightbox[{$name}]" href="{$smarty.const.URL_FULL}thumb.php?id={$record->expFile[0]->id}&{$x}={$config.pa_showall_enlarged}" title="{$record->title|default:$record->expFile[0]->title}">
{else}
- <a href="{link action=show title=$record->sef_url}" title="{$record->title|default:$record->expFile[0]->title}">
+ <a href="{link action=show title=$record->sef_url}" title="{$record->title|default:$record->expFile[0]->title}">
{/if}
{img class="img-small" alt=$record->alt|default:$record->expFile[0]->alt file_id=$record->expFile[0]->id w=$config.pa_showall_thumbbox|default:"150" h=$config.pa_showall_thumbbox|default:"150" zc=1 q=$quality|default:75}
</a>
@@ -48,10 +48,10 @@
{foreach from=$cat->records item=record name=items}
<li style="width:{$config.pa_showall_thumbbox|default:"150"}px;height:{$config.pa_showall_thumbbox|default:"150"}px;">
{if $config.lightbox}
- {if $record->expFile[0]->width >= $record->expFile[0]->height}{assign var=x value="w"}{else}{assign var=x value="w"}{/if}
- <a rel="lightbox[{$name}]" href="{$smarty.const.URL_FULL}thumb.php?id={$record->expFile[0]->id}&{$x}={$config.pa_showall_enlarged}" title="{$record->title|default:$record->expFile[0]->title}">
+ {if $record->expFile[0]->width >= $record->expFile[0]->height}{assign var=x value="w"}{else}{assign var=x value="w"}{/if}
+ <a rel="lightbox[{$name}]" href="{$smarty.const.URL_FULL}thumb.php?id={$record->expFile[0]->id}&{$x}={$config.pa_showall_enlarged}" title="{$record->title|default:$record->expFile[0]->title}">
{else}
- <a href="{link action=show title=$record->sef_url}" title="{$record->title|default:$record->expFile[0]->title}">
+ <a href="{link action=show title=$record->sef_url}" title="{$record->title|default:$record->expFile[0]->title}">
{/if}
{img class="img-small" alt=$record->alt|default:$record->expFile[0]->alt file_id=$record->expFile[0]->id w=$config.pa_showall_thumbbox|default:"150" h=$config.pa_showall_thumbbox|default:"150" zc=1 q=$quality|default:75}
</a>
@@ -39,39 +39,39 @@
<ul class="slideshow-frame" style="width:{$config.width|default:350}px;height:{$config.height|default:300}px;">
{assign var=quality value=$config.quality|default:$smarty.const.THUMB_QUALITY}
{foreach key=key from=$slides item=slide name=slides}
- <li class="slide" style="position:absolute;{if $smarty.foreach.slides.first}z-index:4;{else}z-index:1;{/if}">
- {permissions}
- <div class="item-actions">
- {if $myloc != $slide->location_data}{icon class=merge img='arrow_merge.png' title="Aggregated Content"|gettext}{/if}
- {if $permissions.edit == 1}
- {icon action=edit record=$slide title="Edit"|gettext|cat:" `$item->title`"}
- {/if}
- {if $permissions.delete == 1}
- {icon action=delete record=$slide title="Delete"|gettext|cat:" `$item->title`"}
- {/if}
- {if $permissions.create == 1}
- {icon class=add action=edit rank=$slide->rank+1 title="Add another slide here"|gettext text="Add After"|gettext}
- {/if}
- </div>
- {/permissions}
- {if !$config.hidetext}
- <div class="bodycopy">
- <h2>{$slide->title}</h2>
- {$slide->body}
- </div>
- {/if}
- {if $slide->link}
- <a href="{$slide->link}">
- {/if}
- {if $config.quality==100}
- <img src="{$slide->expFile[0]->url}" class="slide-image" />
- {else}
- {img file_id=$slide->expFile[0]->id w=$config.width|default:350 h=$config.height|default:300 class="slide-image" zc=1 q=$quality|default:75}
- {/if}
- {if $slide->link}
- </a>
- {/if}
- </li>
+ <li class="slide" style="position:absolute;{if $smarty.foreach.slides.first}z-index:4;{else}z-index:1;{/if}">
+ {permissions}
+ <div class="item-actions">
+ {if $myloc != $slide->location_data}{icon class=merge img='arrow_merge.png' title="Aggregated Content"|gettext}{/if}
+ {if $permissions.edit == 1}
+ {icon action=edit record=$slide title="Edit"|gettext|cat:" `$item->title`"}
+ {/if}
+ {if $permissions.delete == 1}
+ {icon action=delete record=$slide title="Delete"|gettext|cat:" `$item->title`"}
+ {/if}
+ {if $permissions.create == 1}
+ {icon class=add action=edit rank=$slide->rank+1 title="Add another slide here"|gettext text="Add After"|gettext}
+ {/if}
+ </div>
+ {/permissions}
+ {if !$config.hidetext}
+ <div class="bodycopy">
+ <h2>{$slide->title}</h2>
+ {$slide->body}
+ </div>
+ {/if}
+ {if $slide->link}
+ <a href="{$slide->link}">
+ {/if}
+ {if $config.quality==100}
+ <img src="{$slide->expFile[0]->url}" class="slide-image" />
+ {else}
+ {img file_id=$slide->expFile[0]->id w=$config.width|default:350 h=$config.height|default:300 class="slide-image" zc=1 q=$quality|default:75}
+ {/if}
+ {if $slide->link}
+ </a>
+ {/if}
+ </li>
{foreachelse}
<li>{"No slides yet"|gettext}</li>
{/foreach}
View
@@ -91,11 +91,11 @@
<span class="label"><?php echo gt('And'); ?>:</span>
<div class="formcontrol radiobutton">
<input type="radio" id="radiocontrol-1" class="radiobutton" value="migration" name="next">
- <label for="radiocontrol-1"><?php echo gt("I want to begin transferring an existing Exponent v0.9x site"); ?></label>
+ <label for="radiocontrol-1"><?php echo gt("I want to transfer an existing Exponent v0.9x site"); ?></label>
</div>
<div class="formcontrol radiobutton">
<input type="radio" id="radiocontrol-2" class="radiobutton" value="configsite" name="next">
- <label for="radiocontrol-2"><?php echo gt("I want to start configuring my new site"); ?></label>
+ <label for="radiocontrol-2"><?php echo gt("I want to configure my new site"); ?></label>
</div>
<div class="formcontrol radiobutton">
<input type="radio" id="radiocontrol-3" class="radiobutton" value="homepage" name="next">
@@ -97,7 +97,7 @@
if ($db->tableIsEmpty('user') || $db->tableIsEmpty('modstate') || $db->tableIsEmpty('section')) {
echo '<div style="color: red; font-weight: bold">';
echo 'No Database Entries Were Found!';
- echo '</div>';
+ echo '<br /></div>';
$emptydb = 'install-2';
$emptydbstr = gt('Switching to Installer');
@@ -1,111 +0,0 @@
-<?php
-##################################################
-#
-# Copyright (c) 2004-2012 OIC Group, Inc.
-#
-# This file is part of Exponent
-#
-# Exponent is free software; you can redistribute
-# it and/or modify it under the terms of the GNU
-# General Public License as published by the Free
-# Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# GPL: http://www.gnu.org/licenses/gpl.txt
-#
-##################################################
-
-class remove_locationref extends upgradescript {
- protected $from_version = '1.99.0';
- protected $to_version = '2.0.1';
-
- function name() { return "Remove the locationref Table"; }
-
- function description() { return "Beginning with Exponent 2.0.0 RC1, the locationref table is no longer used and is replaced by the sectionref table."; }
-
- function upgrade() {
- global $db;
-
- // copy each locationref entry to the sectionref
- $srs = $db->selectObjects('sectionref',"module = 'headlineController'");
- foreach ($srs as $sr) {
- $sr->module = 'textController';
- $db->updateObject($sr,'sectionref');
- }
- $lrs = $db->selectObjects('locationref',"module = 'headlineController'");
- foreach ($lrs as $lr) {
- $lr->module = 'textController';
- $db->updateObject($lr,'locationref');
- }
- $gps = $db->selectObjects('grouppermission',"module = 'headlineController'");
- foreach ($gps as $gp) {
- $gp->module = 'textController';
- $db->updateObject($gp,'grouppermission');
- }
- $ups = $db->selectObjects('userpermission',"module = 'headlineController'");
- foreach ($ups as $up) {
- $up->module = 'textController';
- $db->updateObject($up,'userpermission');
- }
-
- // convert each headline module to a text module
- $modules_converted = 0;
- $cns = $db->selectObjects('container',"internal LIKE '%headlineController%'");
- foreach ($cns as $cn) {
- $cloc = expUnserialize($cn->internal);
- $cloc->mod = 'textController';
- $cn->internal = serialize($cloc);
- $cn->view = 'showall';
- $cn->action = 'showall';
- $db->updateObject($cn,'container');
- $modules_converted += 1;
- }
-
- // create a text item for each headline item
- $headlines_converted = 0;
- $headlines = $db->selectObjects('headline',"1");
- foreach ($headlines as $hl) {
- $text = new text();
- $loc = expUnserialize($hl->location_data);
- $loc->mod = "text";
- $text->location_data = serialize($loc);
- $text->title = $hl->title;
- $text->poster = $hl->poster;
- $text->save();
- $text->created_at = $hl->created_at;
- $text->edited_at = $hl->edited_at;
- $text->update();
- $headlines_converted += 1;
- }
-
-// FIXME - remove when final
-return "TEST - We're NOT removing the locationref table nor the files yet...<br>".$modules_converted." Headline modules were converted.<br>".$headlines_converted." Headlines were converted.<br>";
-
- // delete headline table
- $db->dropTable('locationref');
-
- // check if the headline controller files are there and remove them
- $files = array(
- BASE."framework/modules/definitions/headline.php",
- BASE."framework/modules/models/headline.php",
- BASE."framework/modules/headline/"
- );
-
- // delete the files.
- $removed = 0;
- $errors = 0;
- foreach ($files as $file) {
- if (expUtil::isReallyWritable($file)) {
- unlink ($file);
- $removed += 1;
- } else {
- $errors += 1;
- }
- }
-
- return $modules_converted." Headline modules were converted.<br>".$headlines_converted." Headlines were converted.<br>".$removed." files were deleted.<br>".$errors." files could not be removed.";
-
- }
-}
-
-?>
View
@@ -23,17 +23,17 @@
// Since bootstrap doesn't setup the session we need to define this
// otherwise the expFile can't find it's table desc from cache.
if (!defined('SYS_SESSION_KEY')) define('SYS_SESSION_KEY',PATH_RELATIVE);
- if (isset($_GET['id'])) {
- // Initialize the Database Subsystem
- $db = expDatabase::connect(DB_USER,DB_PASS,DB_HOST.':'.DB_PORT,DB_NAME);
+if (isset($_GET['id'])) {
+ // Initialize the Database Subsystem
+ $db = expDatabase::connect(DB_USER,DB_PASS,DB_HOST.':'.DB_PORT,DB_NAME);
- $file_obj = new expFile($_GET['id']);
- //$_GET['src'] = "/" . $file_obj->directory.$file_obj->filename;
- $_GET['src'] = $file_obj->path;
-
- unset($_GET['id']);
- unset($_GET['square']);
- }
- require_once(BASE."external/phpThumb/phpThumb.php");
+ $file_obj = new expFile(intval($_GET['id']));
+ //$_GET['src'] = "/" . $file_obj->directory.$file_obj->filename;
+ $_GET['src'] = $file_obj->path;
+
+ unset($_GET['id']);
+ unset($_GET['square']);
+}
+require_once(BASE."external/phpThumb/phpThumb.php");
?>

0 comments on commit 642a2ca

Please sign in to comment.