Merge branch 'saas-dev' into saas-dev-publishing
Conflicts: airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
Albert Santoni
commit
5bd8a508b1
|
|
@ -119,10 +119,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
|
|||
$csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
|
||||
// Check if the token exists
|
||||
if (!$csrf_namespace->authtoken) {
|
||||
// If we don't have a token, regenerate it and set a 2 hour timeout
|
||||
// If we don't have a token, regenerate it and set a 1 week timeout
|
||||
// Should we log the user out here if the token is expired?
|
||||
$csrf_namespace->authtoken = sha1(uniqid(rand(), 1));
|
||||
$csrf_namespace->setExpirationSeconds(2 * 60 * 60);
|
||||
$csrf_namespace->setExpirationSeconds(168 * 60 * 60);
|
||||
}
|
||||
|
||||
//Here we are closing the session for writing because otherwise no requests
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@ function validatePlan()
|
|||
|
||||
function validateVATNumber()
|
||||
{
|
||||
if ($(vatFieldId).val() == '') {
|
||||
return;
|
||||
}
|
||||
|
||||
$.post("/billing/vat-validator", { "vatnumber" : $(vatFieldId).val(), "country" : $("#country").val() })
|
||||
.success(function(data, textStatus, jqXHR) {
|
||||
if (data["result"]) {
|
||||
|
|
@ -261,6 +265,10 @@ echo($currentProduct["name"]);
|
|||
//echo Application_Model_Preference::GetPlanLevel();
|
||||
?>
|
||||
</p>
|
||||
<div class="educational-discount">
|
||||
<h4>Are you a student or educator?</h4>
|
||||
<p>Sign up on an annual plan before the end of October to receive a special educational discount. <a href="https://www.airtime.pro/educational-discount">Find out more</a>.</p>
|
||||
</div>
|
||||
|
||||
<h3><?php echo(_pro('Choose a plan: ')); ?></h3>
|
||||
<form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -11,8 +11,8 @@ msgstr ""
|
|||
"Project-Id-Version: Airtime\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2015-09-04 11:17-0400\n"
|
||||
"PO-Revision-Date: 2015-09-05 08:33+0000\n"
|
||||
"Last-Translator: Daniel James <daniel@64studio.com>\n"
|
||||
"PO-Revision-Date: 2015-09-11 14:33+0000\n"
|
||||
"Last-Translator: Maria Ituarte <maria.ituarte@sourcefabric.org>\n"
|
||||
"Language-Team: Spanish (Spain) (http://www.transifex.com/sourcefabric/airtime/language/es_ES/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -314,7 +314,7 @@ msgstr "Copia de %s"
|
|||
#: airtime_mvc/application/controllers/WebstreamController.php:28
|
||||
#: airtime_mvc/application/controllers/WebstreamController.php:32
|
||||
msgid "Untitled Webstream"
|
||||
msgstr "Webstream si nombre"
|
||||
msgstr ""
|
||||
|
||||
#: airtime_mvc/application/controllers/WebstreamController.php:150
|
||||
msgid "Webstream saved."
|
||||
|
|
@ -408,7 +408,7 @@ msgstr ""
|
|||
#: airtime_mvc/application/controllers/Apiv2Controller.php:77
|
||||
#: airtime_mvc/application/controllers/ApiController.php:79
|
||||
msgid "You are not allowed to access this resource."
|
||||
msgstr "No tienes permiso para acceder a esta fuente."
|
||||
msgstr "No tienes permiso para acceder esta fuente."
|
||||
|
||||
#: airtime_mvc/application/controllers/PreferenceController.php:72
|
||||
msgid "Preferences updated."
|
||||
|
|
@ -3293,7 +3293,7 @@ msgstr "Tipo de usuario:"
|
|||
#: airtime_mvc/application/forms/AddUser.php:120
|
||||
#: airtime_mvc/application/forms/EditUser.php:155
|
||||
msgid "Login name is not unique."
|
||||
msgstr "Tu usuario no es único."
|
||||
msgstr "El nombre de usuario no es único."
|
||||
|
||||
#: airtime_mvc/application/forms/WatchedDirPreferences.php:14
|
||||
msgid "Import Folder:"
|
||||
|
|
|
|||
|
|
@ -274,3 +274,25 @@
|
|||
color: #ff611f;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.billing-panel .educational-discount {
|
||||
border: 1px solid #306999;
|
||||
border-radius: 3px;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
box-sizing: border-box;
|
||||
padding: 16px;
|
||||
background-color: #b8d9f4;
|
||||
color: #234f5d;
|
||||
|
||||
}
|
||||
.billing-panel .educational-discount h4 {
|
||||
color: #1e415d;
|
||||
font-weight: bold;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
.billing-panel .educational-discount p {
|
||||
margin: 0px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -550,7 +550,7 @@ var AIRTIME = (function(AIRTIME) {
|
|||
"bProcessing": true,
|
||||
"bServerSide": true,
|
||||
|
||||
"aLengthMenu": [5, 10, 15, 20, 25, 50, 100],
|
||||
"aLengthMenu": [25, 50, 100],
|
||||
|
||||
"bStateSave": true,
|
||||
"fnStateSaveParams": function (oSettings, oData) {
|
||||
|
|
|
|||
|
|
@ -387,7 +387,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
redrawLib();
|
||||
}
|
||||
|
||||
function setFadeIcon(){
|
||||
mod.setFadeIcon = function() {
|
||||
var contents = $pl.find(".spl_sortable");
|
||||
var show = contents.is(":visible");
|
||||
var empty = $pl.find(".spl_empty");
|
||||
|
|
@ -899,7 +899,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
dt.fnStandingRedraw();
|
||||
}
|
||||
}
|
||||
setFadeIcon();
|
||||
mod.setFadeIcon();
|
||||
disableLoadingIcon();
|
||||
}
|
||||
);
|
||||
|
|
@ -1142,7 +1142,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
}
|
||||
else {
|
||||
setPlaylistContent(json);
|
||||
setFadeIcon();
|
||||
mod.setFadeIcon();
|
||||
$pl.find('.errors').hide();
|
||||
}
|
||||
|
||||
|
|
@ -1445,7 +1445,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
setPlaylistEntryEvents();
|
||||
setCueEvents();
|
||||
setFadeEvents();
|
||||
setFadeIcon();
|
||||
mod.setFadeIcon();
|
||||
|
||||
initialEvents();
|
||||
setUpPlaylist();
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
appendAddButton();
|
||||
appendModAddButton();
|
||||
removeButtonCheck();
|
||||
AIRTIME.playlist.setFadeIcon();
|
||||
}
|
||||
|
||||
/* #####################################################
|
||||
|
|
|
|||
Loading…
Reference in New Issue