Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SirsiDynix UI Update #27

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
e9a0602
First pass CSS Merge
pontifechs Oct 7, 2015
0c13dd1
Mis-merges
pontifechs Oct 8, 2015
d791d7c
CAMP-786 Removed the fish icons
DavidRappleye Nov 10, 2015
beee9f6
CAMP-853: Merged Ryan's CSS Changes
Dec 28, 2015
5e79d04
CAMP-853: Merged Ryan's CSS Changes
Dec 28, 2015
d92f7df
CAMP-853: Final CSS Changes
chisumism Jan 14, 2016
e819516
CAMP-853: Finalizing CSS
chisumism Jan 27, 2016
d845dc9
CAMP-853: Removed Center Tag from Header
chisumism Jan 28, 2016
7a8c1f6
CAMP-853: Replaced Center Tag in Header
chisumism Jan 28, 2016
d28dcb8
CAMP-853: Final CSS
chisumism Jan 29, 2016
3a3a287
Added Help Link to Logout Menu
chisumism Feb 22, 2016
0b16828
CAMP-925: Various Layout Fixes/Issues and Downtime CSS
chisumism Mar 9, 2016
7e0aa5a
CAMP-925: Various Layout Fixes/Issues and Downtime CSS
chisumism Mar 9, 2016
c5a3482
Merged localization functionality (French) into our branch
Mar 14, 2016
1300570
Localization directories and images
Mar 14, 2016
80a07f1
Fixed Resources in Change Module
Mar 15, 2016
866234b
Added Classes to Buttons
chisumism Mar 30, 2016
de4f1ef
French Updates
Apr 4, 2016
f0a34df
New French Translations
Apr 6, 2016
ac4b1d0
Changes for additional languages
Apr 6, 2016
93d2f8a
Fixed bindtextdomain path
Apr 7, 2016
91777e2
fixed changed default locale to get 5 characters instead of 2
Apr 11, 2016
89de8e1
Merge branch 'master' of https://github.com/pontifechs/licensing
Apr 11, 2016
1ff38ad
Adding Onix-PL Import Functionality
Apr 28, 2016
6f8b2bb
Onix-PL Import Functionality
Apr 28, 2016
689a22f
ONIX-PL Import Functionality
Apr 29, 2016
7c39e3d
ONIX-PL Functionality Complete
May 2, 2016
0bc1a51
Changes to Main Menu Spacing and Language Selector
chisumism May 2, 2016
d4ecd07
Changes to Main Menu Spacing and Language Selector
chisumism May 2, 2016
9890a70
Changed text CSV to XML on ONIX-PL import screen
May 2, 2016
af8a541
New French Images
May 2, 2016
a5bf041
Moved Language Dropdown/Main Menu Images
chisumism May 3, 2016
cc53d60
Moved Language Dropdown/Main Menu Images
chisumism May 3, 2016
d299b89
Moved Language Dropdown/Main Menu Images
chisumism May 3, 2016
b309a9e
Updated French Translations
May 4, 2016
df27030
Patched Security Hole
May 4, 2016
23ea20f
Added License Helpful Links Pane with Resources Linked to License
May 6, 2016
8bd664d
Change Table Width for LibLicense
chisumism May 6, 2016
77b3416
Newly Designed Main Menu
chisumism May 9, 2016
0326288
Added Translations for Updated Menus
May 9, 2016
7e45ab9
French Translations from New Menu Functionality
May 10, 2016
c88efb3
French Translations from New Menu Functionality
May 10, 2016
593bb03
French Translations from New Menu Functionality
May 10, 2016
b0e73f6
French Translations from New Menu Functionality
May 10, 2016
c708b04
Module Menu Adjustments
chisumism May 10, 2016
56ffd18
Module Menu Adjustments
chisumism May 10, 2016
0a0f963
Fixed Translation for New Menus
May 10, 2016
1fc79e9
Newly Designed Title Bars
chisumism May 11, 2016
3fc329c
Newly Designed Title Bars
chisumism May 11, 2016
9cf9b1b
French Translations for New Title Header
May 11, 2016
e22f0ac
Added Open Sans Font
chisumism May 11, 2016
4307941
Hello, logout, and help translations
May 12, 2016
f190add
Replaced space colon with colon in French Translations
Jun 6, 2016
a8fcb11
Fixed Language Code -- changed all references to look at 5 characters…
Jun 13, 2016
2a1ff3f
Changed Helpful Links to Be Translatable
chisumism Jun 13, 2016
c3b6226
Updated French Language
Jun 13, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions LangCodes.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php
/**
* @author: Cesar Hernandez
* getLanguage: This method return the language code
* getNameLang: This method return the name of the language
*/
class LangCodes{
public function getLanguage($code){
$all_lang=array(
'fr_FR'=>'fr_FR',
'en_US'=>'en_US'//,
//'zh_CN'=>'zh_CN',
//'zh_TW'=>'zh_TW',
//'de_DE'=>'de_DE'
);
return $all_lang[$code];
}
public function getNameLang($code_lang){
$name_lang=array(
'fr_FR'=>'Français',
'en_US'=>'English'//,
//'zh_CN'=>'中文 (中国)',
//'zh_TW'=>'中文 (台灣)',
//'de_DE'=>'Deutsch'
);
return $name_lang[$code_lang];
}
}
?>
56 changes: 28 additions & 28 deletions admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

include_once 'directory.php';

$pageTitle='Administration';
$pageTitle=_('Administration');
include 'templates/header.php';

//set referring page
Expand All @@ -32,11 +32,11 @@

<table class="headerTable">
<tr><td>
<span class="headerText">Users</span>&nbsp;&nbsp;<span id='span_User_response' class='redText'></span>
<br /><span id='span_newUser' class='adminAddInput'><a href='ajax_forms.php?action=getAdminUserUpdateForm&height=202&width=288&modal=true' class='thickbox' id='expression'>add new user</a></span>
<span class="headerText"><?php echo _("Users");?></span>&nbsp;&nbsp;<span id='span_User_response' class='redText'></span>
<br /><span id='span_newUser' class='adminAddInput'><a href='ajax_forms.php?action=getAdminUserUpdateForm&height=202&width=288&modal=true' class='thickbox' id='expression'><?php echo _("add new user");?></a></span>
<br /><br />
<div id='div_User'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -49,11 +49,11 @@

<table class="headerTable">
<tr><td>
<span class="headerText">Document Types</span>&nbsp;&nbsp;<span id='span_DocumentType_response'></span>
<br /><span id='span_newDocumentType' class='adminAddInput'><a href='javascript:showAdd("DocumentType");'>add new document type</a></span>
<span class="headerText"><?php echo _("Document Types");?></span>&nbsp;&nbsp;<span id='span_DocumentType_response'></span>
<br /><span id='span_newDocumentType' class='adminAddInput'><a href='javascript:showAdd("DocumentType");'><?php echo _("add new document type");?></a></span>
<br /><br />
<div id='div_DocumentType'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -63,11 +63,11 @@

<table class="headerTable">
<tr><td>
<span class="headerText">Expression Types</span>&nbsp;&nbsp;<span id='span_ExpressionType_response'></span>
<br /><span id='span_newExpressionType' class='adminAddInput'><a href='ajax_forms.php?action=getExpressionTypeForm&height=148&width=265&modal=true' class='thickbox' id='expressionType'>add new expression type</a></span>
<span class="headerText"><?php echo _("Expression Types");?></span>&nbsp;&nbsp;<span id='span_ExpressionType_response'></span>
<br /><span id='span_newExpressionType' class='adminAddInput'><a href='ajax_forms.php?action=getExpressionTypeForm&height=148&width=265&modal=true' class='thickbox' id='expressionType'><?php echo _("add new expression type");?></a></span>
<br /><br />
<div id='div_ExpressionType'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -76,11 +76,11 @@
<br />
<table class="headerTable">
<tr><td>
<span class="headerText">Qualifiers</span>&nbsp;&nbsp;<span id='span_Qualifier_response'></span>
<br /><span id='span_newQualifier' class='adminAddInput'><a href='ajax_forms.php?action=getQualifierForm&height=148&width=295&modal=true' class='thickbox'>add new qualifier</a></span>
<span class="headerText"><?php echo _("Qualifiers");?></span>&nbsp;&nbsp;<span id='span_Qualifier_response'></span>
<br /><span id='span_newQualifier' class='adminAddInput'><a href='ajax_forms.php?action=getQualifierForm&height=148&width=295&modal=true' class='thickbox'><?php echo _("add new qualifier");?></a></span>
<br /><br />
<div id='div_Qualifier'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -90,11 +90,11 @@

<table class="headerTable">
<tr><td>
<span class="headerText">Signature Types</span>&nbsp;&nbsp;<span id='span_SignatureType_response'></span>
<br /><span id='span_newSignatureType' class='adminAddInput'><a href='javascript:showAdd("SignatureType");'>add new signature type</a></span>
<span class="headerText"><?php echo _("Signature Types");?></span>&nbsp;&nbsp;<span id='span_SignatureType_response'></span>
<br /><span id='span_newSignatureType' class='adminAddInput'><a href='javascript:showAdd("SignatureType");'><?php echo _("add new signature type");?></a></span>
<br /><br />
<div id='div_SignatureType'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -105,11 +105,11 @@

<table class="headerTable">
<tr><td>
<span class="headerText">License Statuses</span>&nbsp;&nbsp;<span id='span_Status_response'></span>
<br /><span id='span_newStatus' class='adminAddInput'><a href='javascript:showAdd("Status");'>add new license status</a></span>
<span class="headerText"><?php echo _("License Statuses");?></span>&nbsp;&nbsp;<span id='span_Status_response'></span>
<br /><span id='span_newStatus' class='adminAddInput'><a href='javascript:showAdd("Status");'><?php echo _("add new license status");?></a></span>
<br /><br />
<div id='div_Status'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -126,10 +126,10 @@

<table class="headerTable">
<tr><td>
<span class="headerText">Calendar Settings</span>&nbsp;&nbsp;<span id='span_CalendarSettings_response'></span>
<span class="headerText"><?php echo _("Calendar Settings");?></span>&nbsp;&nbsp;<span id='span_CalendarSettings_response'></span>
<br /><br />
<div id='div_CalendarSettings'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -146,11 +146,11 @@

<table class="headerTable">
<tr><td>
<span class="headerText">Consortia</span>&nbsp;&nbsp;<span id='span_Consortium_response'></span>
<br /><span id='span_newConsortium' class='adminAddInput'><a href='javascript:showAdd("Consortium");'>add new consortium</a></span>
<span class="headerText"><?php echo _("Consortia");?></span>&nbsp;&nbsp;<span id='span_Consortium_response'></span>
<br /><span id='span_newConsortium' class='adminAddInput'><a href='javascript:showAdd("Consortium");'><?php echo _("add new consortium");?></a></span>
<br /><br />
<div id='div_Consortium'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -160,11 +160,11 @@

<table class="headerTable">
<tr><td>
<span class="headerText">Providers</span>&nbsp;&nbsp;<span id='span_Organization_response'></span>
<br /><span id='span_newOrganization' class='adminAddInput'><a href='javascript:showAdd("Organization");'>add new provider</a></span>
<span class="headerText"><?php echo _("Providers");?></span>&nbsp;&nbsp;<span id='span_Organization_response'></span>
<br /><span id='span_newOrganization' class='adminAddInput'><a href='javascript:showAdd("Organization");'><?php echo _("add new provider");?></a></span>
<br /><br />
<div id='div_Organization'>
<img src = "images/circle.gif">Loading...
<img src = "images/circle.gif"><?php echo _("Loading...");?>
</div>
</td></tr>
</table>
Expand All @@ -177,7 +177,7 @@

<?php
}else{
echo "You don't have permission to access this page";
echo _("You don't have permission to access this page");
}

include 'templates/footer.php';
Expand Down
3 changes: 2 additions & 1 deletion admin/classes/common/DBService.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function dealloc() {

protected function checkForError() {
if ($this->error = mysqli_error($this->db)) {
throw new Exception("There was a problem with the database: " . $this->error);
throw new Exception(_("There was a problem with the database: ") . $this->error);
}
}

Expand All @@ -48,6 +48,7 @@ protected function connect() {
$databaseName = $this->config->database->name;
$this->db = mysqli_connect($host, $username, $password, $databaseName);
$this->checkForError();
mysqli_set_charset($this->db, 'utf8');
}

protected function disconnect() {
Expand Down
176 changes: 88 additions & 88 deletions admin/classes/common/Object.php
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
<?php
/*
**************************************************************************************************************************
** CORAL Licensing Module v. 1.0
**
** Copyright (c) 2010 University of Notre Dame
**
** This file is part of CORAL.
**
** CORAL 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 3 of the License, or (at your option) any later version.
**
** CORAL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License along with CORAL. If not, see <http://www.gnu.org/licenses/>.
**
**************************************************************************************************************************
*/


class Object {

public function __construct(NamedArguments $arguments = NULL) {
if (method_exists($this, 'init')) {
if (!is_a($arguments, 'NamedArguments')) {
$arguments = new NamedArguments(array());
}
$this->init($arguments);
}
}

// An optional initializer to use instead of |__construct()|.
protected function init(NamedArguments $arguments) {

}

public function __destruct() {
if (method_exists($this, 'dealloc')) {
$this->dealloc();
}
}

// An optional method called on deconstruction instead of |__deconstruct()|.
protected function dealloc() {

}

// Setters are functions called |$instance->setPropertyName($value)|.
public function __set($name, $value) {
$methodName = 'set' . ucfirst($name);
$this->$methodName($value);
}

// Getters are functions called |$instance->propertyName()|.
public function __get($name) {
return $this->$name();
}

// Default setter uses declared properties.
protected function setValueForKey($key, $value) {
if (property_exists($this, $key)) {
$this->$key = $value;
} else {
throw new Exception("Cannot set value for undefined key ($key).");
}
}

// Default getter uses declared properties.
protected function valueForKey($key) {
if (property_exists($this, $key)) {
return $this->$key;
} else {
throw new Exception("Cannot get value for undefined key ($key).");
}
}

// Call |valueForKey| and |setValueForKey| as default setter and getter.
public function __call($name, $arguments) {
if (preg_match('/^set[A-Z]/', $name)) {
$key = preg_replace('/^set/', '\1', $name);
$key = lcfirst($key);
$this->setValueForKey($key, $arguments[0]);
} else {
return $this->valueForKey($name);
}
}

}

<?php
/*
**************************************************************************************************************************
** CORAL Licensing Module v. 1.0
**
** Copyright (c) 2010 University of Notre Dame
**
** This file is part of CORAL.
**
** CORAL 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 3 of the License, or (at your option) any later version.
**
** CORAL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License along with CORAL. If not, see <http://www.gnu.org/licenses/>.
**
**************************************************************************************************************************
*/
class Object {
public function __construct(NamedArguments $arguments = NULL) {
if (method_exists($this, 'init')) {
if (!is_a($arguments, 'NamedArguments')) {
$arguments = new NamedArguments(array());
}
$this->init($arguments);
}
}
// An optional initializer to use instead of |__construct()|.
protected function init(NamedArguments $arguments) {
}
public function __destruct() {
if (method_exists($this, 'dealloc')) {
$this->dealloc();
}
}
// An optional method called on deconstruction instead of |__deconstruct()|.
protected function dealloc() {
}
// Setters are functions called |$instance->setPropertyName($value)|.
public function __set($name, $value) {
$methodName = 'set' . ucfirst($name);
$this->$methodName($value);
}
// Getters are functions called |$instance->propertyName()|.
public function __get($name) {
return $this->$name();
}
// Default setter uses declared properties.
protected function setValueForKey($key, $value) {
if (property_exists($this, $key)) {
$this->$key = $value;
} else {
throw new Exception("Cannot set value for undefined key ($key).");
}
}
// Default getter uses declared properties.
protected function valueForKey($key) {
if (property_exists($this, $key)) {
return $this->$key;
} else {
throw new Exception(_("Cannot get value for undefined key (").$key.").");
}
}
// Call |valueForKey| and |setValueForKey| as default setter and getter.
public function __call($name, $arguments) {
if (preg_match('/^set[A-Z]/', $name)) {
$key = preg_replace('/^set/', '\1', $name);
$key = lcfirst($key);
$this->setValueForKey($key, $arguments[0]);
} else {
return $this->valueForKey($name);
}
}
}
?>
Loading