Author: ggrekhov
Date: Fri Jun 1 09:39:57 2012
New Revision: 1345027
URL: http://svn.apache.org/viewvc?rev=1345027&view=rev
Log:
Design updates
Modified:
incubator/openmeetings/trunk/plugins/teambox/css/index.css
incubator/openmeetings/trunk/plugins/teambox/index.php
incubator/openmeetings/trunk/plugins/teambox/rest_lib/RestService.php
incubator/openmeetings/trunk/plugins/teambox/rest_lib/TeamBoxRestService.php
Modified: incubator/openmeetings/trunk/plugins/teambox/css/index.css
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/teambox/css/index.css?rev=1345027&r1=1345026&r2=1345027&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/teambox/css/index.css (original)
+++ incubator/openmeetings/trunk/plugins/teambox/css/index.css Fri Jun 1
09:39:57 2012
@@ -1,4 +1,4 @@
-.button-primary, .button-danger {
+.button-primary, .button-danger, .button {
width: 200px;
white-space: nowrap;
overflow: hidden;
Modified: incubator/openmeetings/trunk/plugins/teambox/index.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/teambox/index.php?rev=1345027&r1=1345026&r2=1345027&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/teambox/index.php (original)
+++ incubator/openmeetings/trunk/plugins/teambox/index.php Fri Jun 1 09:39:57
2012
@@ -47,7 +47,7 @@ if (!$logged) {
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
-<link rel="stylesheet" type="text/css"
href="https://d238xsvyykqg39.cloudfront.net/assets/public-9083c95676119d2654a02c3057084689.css";
media="screen" />
+<link rel="stylesheet" type="text/css"
href="https://d238xsvyykqg39.cloudfront.net/assets/public-61885d5db2e6b3192d52d9e3c742ba00.css";
media="screen" />
<link rel="stylesheet" type="text/css" href="css/index.css" media="screen" />
<div style="text-align: center;">
@@ -69,14 +69,14 @@ if (0 == count($organizations)) {
echo '<tr>';
echo '<td>';
- echo '<a class="button button-danger"
href="'.$url.'"><span>'.$organization->name.'</span></a>';
+ echo '<a class="button button-primary"
href="'.$url.'"><span>'.$organization->name.'</span></a>';
echo '</td>';
echo '<td>';
foreach ($projects as $project) {
if ($project->organization_id === $organization->id) {
$url = $omService->getInvitationForProject($organization,
$project, $account);
- echo '<p><a class="button button-primary"
href="'.$url.'"><span>'.$project->name.'</span></a></p>';
+ echo '<p><a class="button"
href="'.$url.'"><span>'.$project->name.'</span></a></p>';
}
}
echo '</td>';
Modified: incubator/openmeetings/trunk/plugins/teambox/rest_lib/RestService.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/teambox/rest_lib/RestService.php?rev=1345027&r1=1345026&r2=1345027&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/teambox/rest_lib/RestService.php
(original)
+++ incubator/openmeetings/trunk/plugins/teambox/rest_lib/RestService.php Fri
Jun 1 09:39:57 2012
@@ -65,7 +65,11 @@ class RestService {
// Confirm that the request was transmitted to the service! Image
Search Service
if(!$response) {
- die("Request ".$this->serviceName."! ".$this->serviceName."
Service failed and no response was returned.");
+ if ($dieOnError) {
+ die("Request ".$this->serviceName."! ".$this->serviceName."
Service failed and no response was returned.");
+ } else {
+ return false;
+ }
}
// Create an array to store the HTTP response codes
Modified:
incubator/openmeetings/trunk/plugins/teambox/rest_lib/TeamBoxRestService.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/teambox/rest_lib/TeamBoxRestService.php?rev=1345027&r1=1345026&r2=1345027&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/teambox/rest_lib/TeamBoxRestService.php
(original)
+++
incubator/openmeetings/trunk/plugins/teambox/rest_lib/TeamBoxRestService.php
Fri Jun 1 09:39:57 2012
@@ -56,7 +56,7 @@ class TeamBoxRestService extends RestSer
public function getUserProjects() {
$url = $this->restApiUrl . 'projects';
- $parameters = 'access_token=' . $this->accessToken;
+ $parameters = 'access_token=' . $this->accessToken.'&count=0';
$response = $this->call($url, $parameters, 'GET');
$data = $this->getJsonMultiData($response);
