Skip to content

Commit

Permalink
Invert order of textelements in title
Browse files Browse the repository at this point in the history
  • Loading branch information
@nils-werner
nils-werner committed Oct 5, 2011
1 parent 028892b commit f0645df
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion symphony/content/content.blueprintscomponents.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

public function view(){
$this->setPageType('forms');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), __('Components'))));
$this->setTitle(__('%1$s – %2$s', array(__('Components'), __('Symphony'))));

$this->appendSubheading(__('Components'));

Expand Down
4 changes: 2 additions & 2 deletions symphony/content/content.blueprintsdatasources.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public function __form(){
}

$this->setPageType('form');
$this->setTitle(__(($isEditing ? '%1$s – %2$s – %3$s' : '%1$s – %2$s'), array(__('Symphony'), __('Data Sources'), $about['name'])));
$this->setTitle(__(($isEditing ? '%1$s – %2$s – %3$s' : '%2$s – %3$s'), array($about['name'], __('Data Sources'), __('Symphony'))));
$this->appendSubheading(($isEditing ? $about['name'] : __('Untitled')));

$fieldset = new XMLElement('fieldset');
Expand Down Expand Up @@ -872,7 +872,7 @@ public function __viewInfo(){
$datasource = DatasourceManager::create($this->_context[1], NULL, false);
$about = $datasource->about();

$this->setTitle(__('%1$s – %2$s – %3$s', array(__('Symphony'), __('Data Source'), $about['name'])));
$this->setTitle(__('%1$s – %2$s – %3$s', array($about['name'], __('Data Source'), __('Symphony'))));
$this->appendSubheading($about['name']);
$this->Form->setAttribute('id', 'controller');

Expand Down
2 changes: 1 addition & 1 deletion symphony/content/content.blueprintsevents.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function __form($readonly=false){
if(isset($_POST['fields'])) $fields = $_POST['fields'];

$this->setPageType('form');
$this->setTitle(__(($isEditing ? '%1$s – %2$s – %3$s' : '%1$s – %2$s'), array(__('Symphony'), __('Events'), $about['name'])));
$this->setTitle(__(($isEditing ? '%1$s – %2$s – %3$s' : '%2$s – %3$s'), array($about['name'], __('Events'), __('Symphony'))));
$this->appendSubheading(($isEditing ? $about['name'] : __('Untitled')));

if(!$readonly):
Expand Down
14 changes: 7 additions & 7 deletions symphony/content/content.blueprintspages.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class contentBlueprintsPages extends AdministrationPage {

public function __viewIndex() {
$this->setPageType('table');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), __('Pages'))));
$this->setTitle(__('%1$s – %2$s', array(__('Pages'), __('Symphony'))));

$nesting = (Symphony::Configuration()->get('pages_table_nest_children', 'symphony') == 'yes');

Expand Down Expand Up @@ -205,11 +205,11 @@ public function __viewTemplate() {
}

$this->setTitle(__(
($filename ? '%1$s – %2$s – %3$s' : '%1$s – %2$s'),
($filename ? '%1$s – %2$s – %3$s' : '%2$s – %3$s'),
array(
__('Symphony'),
$filename,
__('Pages'),
$filename
__('Symphony')
)
));

Expand Down Expand Up @@ -380,11 +380,11 @@ public function __viewEdit() {
if(trim($title) == '') $title = $existing['title'];

$this->setTitle(__(
($title ? '%1$s – %2$s – %3$s' : '%1$s – %2$s'),
($title ? '%1$s – %2$s – %3$s' : '%2$s – %3$s'),
array(
__('Symphony'),
$title,
__('Pages'),
$title
__('Symphony')
)
));
if($existing) {
Expand Down
6 changes: 3 additions & 3 deletions symphony/content/content.blueprintssections.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

public function __viewIndex(){
$this->setPageType('table');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), __('Sections'))));
$this->setTitle(__('%1$s – %2$s', array(__('Sections'), __('Symphony'))));
$this->appendSubheading(__('Sections'), Widget::Anchor(__('Create New'), Administration::instance()->getCurrentPageURL().'new/', __('Create a section'), 'create button', NULL, array('accesskey' => 'c')));

$sections = SectionManager::fetch(NULL, 'ASC', 'sortorder');
Expand Down Expand Up @@ -99,7 +99,7 @@ public function __viewIndex(){

public function __viewNew(){
$this->setPageType('form');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), __('Sections'))));
$this->setTitle(__('%1$s – %2$s', array(__('Sections'), __('Symphony'))));
$this->appendSubheading(__('Untitled'));

$types = array();
Expand Down Expand Up @@ -325,7 +325,7 @@ public function __viewEdit(){
}

$this->setPageType('form');
$this->setTitle(__('%1$s – %2$s – %3$s', array(__('Symphony'), __('Sections'), $meta['name'])));
$this->setTitle(__('%1$s – %2$s – %3$s', array($meta['name'], __('Sections'), __('Symphony'))));
$this->appendSubheading($meta['name']);

$fieldset = new XMLElement('fieldset');
Expand Down
2 changes: 1 addition & 1 deletion symphony/content/content.blueprintsutilities.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function view(){
}
}

$this->setTitle(__(($this->_context[0] == 'new' ? '%1$s – %2$s' : '%1$s – %2$s – %3$s'), array(__('Symphony'), __('Utilities'), $filename)));
$this->setTitle(__(($this->_context[0] == 'new' ? '%2$s – %3$s' : '%1$s – %2$s – %3$s'), array($filename, __('Utilities'), __('Symphony'))));
$this->appendSubheading(($this->_context[0] == 'new' ? __('Untitled') : $filename));

if(!empty($_POST)) $fields = $_POST['fields'];
Expand Down
2 changes: 1 addition & 1 deletion symphony/content/content.login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function __construct(){
$this->addStylesheetToHead(SYMPHONY_URL . '/assets/basic.css', 'screen', 40);
$this->addStylesheetToHead(SYMPHONY_URL . '/assets/login.css', 'screen', 40);

$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), __('Login'))));
$this->setTitle(__('%1$s – %2$s', array(__('Login'), __('Symphony'))));

Symphony::Profiler()->sample('Page template created', PROFILE_LAP);
}
Expand Down
6 changes: 3 additions & 3 deletions symphony/content/content.publish.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function __viewIndex(){
$section = SectionManager::fetch($section_id);

$this->setPageType('table');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), $section->get('name'))));
$this->setTitle(__('%1$s – %2$s', array($section->get('name'), __('Symphony'))));
$this->Form->setAttribute("class", $this->_context['section_handle']);

$filters = array();
Expand Down Expand Up @@ -459,7 +459,7 @@ public function __viewNew() {

$this->setPageType('form');
$this->Form->setAttribute('enctype', 'multipart/form-data');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), $section->get('name'))));
$this->setTitle(__('%1$s – %2$s', array($section->get('name'), __('Symphony'))));
$this->appendSubheading(__('Untitled'));
$this->Form->appendChild(Widget::Input('MAX_FILE_SIZE', Symphony::Configuration()->get('max_upload_size', 'admin'), 'hidden'));

Expand Down Expand Up @@ -756,7 +756,7 @@ public function __viewEdit() {

$this->setPageType('form');
$this->Form->setAttribute('enctype', 'multipart/form-data');
$this->setTitle(__('%1$s – %2$s – %3$s', array(__('Symphony'), $section->get('name'), $title)));
$this->setTitle(__('%1$s – %2$s – %3$s', array($title, $section->get('name'), __('Symphony'))));
$this->appendSubheading($title);
$this->Form->appendChild(Widget::Input('MAX_FILE_SIZE', Symphony::Configuration()->get('max_upload_size', 'admin'), 'hidden'));

Expand Down
4 changes: 2 additions & 2 deletions symphony/content/content.systemauthors.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
public function __viewIndex(){

$this->setPageType('table');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), __('Authors'))));
$this->setTitle(__('%1$s – %2$s', array(__('Authors'), __('Symphony'))));

if (Administration::instance()->Author->isDeveloper()) {
$this->appendSubheading(__('Authors'), Widget::Anchor(__('Add an Author'), Administration::instance()->getCurrentPageURL().'new/', __('Add a new author'), 'create button', NULL, array('accesskey' => 'c')));
Expand Down Expand Up @@ -205,7 +205,7 @@ public function __form(){
Administration::instance()->customError(__('Access Denied'), __('You are not authorised to edit other authors.'));
}

$this->setTitle(__(($this->_context[0] == 'new' ? '%1$s – %2$s – %3$s' : '%1$s – %2$s'), array(__('Symphony'), __('Authors'), $author->getFullName())));
$this->setTitle(__(($this->_context[0] == 'new' ? '%2$s – %3$s' : '%1$s – %2$s – %3$s'), array($author->getFullName(), __('Authors'), __('Symphony'))));
$this->appendSubheading(($this->_context[0] == 'new' ? __('Untitled') : $author->getFullName()));

### Essentials ###
Expand Down
2 changes: 1 addition & 1 deletion symphony/content/content.systemextensions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public function __viewIndex(){
$this->setPageType('table');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), __('Extensions'))));
$this->setTitle(__('%1$s – %2$s', array(__('Extensions'), __('Symphony'))));
$this->appendSubheading(__('Extensions'));

$this->Form->setAttribute('action', SYMPHONY_URL . '/system/extensions/');
Expand Down
2 changes: 1 addition & 1 deletion symphony/content/content.systempreferences.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class contentSystemPreferences extends AdministrationPage {
## Overload the parent 'view' function since we dont need the switchboard logic
public function view() {
$this->setPageType('form');
$this->setTitle(__('%1$s – %2$s', array(__('Symphony'), __('Preferences'))));
$this->setTitle(__('%1$s – %2$s', array(__('Preferences'), __('Symphony'))));

$this->appendSubheading(__('Preferences'));

Expand Down
4 changes: 2 additions & 2 deletions symphony/lib/toolkit/class.devkit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ protected function buildHeader($wrapper) {
$this->setTitle(__(
'%1$s – %2$s – %3$s',
array(
__('Symphony'),
$this->_pagedata['title'],
__($this->_title),
$this->_pagedata['title']
__('Symphony')
)
));

Expand Down

0 comments on commit f0645df

Please sign in to comment.