Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Adapt 2.0 design to 1.0 interface

  • Loading branch information...
commit 3f593bc38ec2cfbfd349d65a37c51a8bd03bd5c4 1 parent c1bca40
@anildash anildash authored ginatrapani committed
Showing with 2,152 additions and 906 deletions.
  1. +2 −2 tests/WebTestOfPostDetailPage.php
  2. +1 −1  webapp/_lib/controller/class.InstallerController.php
  3. +1 −2  webapp/_lib/model/class.Installer.php
  4. +4 −2 webapp/_lib/view/_footer.tpl
  5. +5 −6 webapp/_lib/view/_header.tpl
  6. +4 −5 webapp/_lib/view/_install.header.tpl
  7. +1 −1  webapp/_lib/view/_link.tpl
  8. +2 −3 webapp/_lib/view/_plugin.options.tpl
  9. +1 −1  webapp/_lib/view/_post.author_no_counts.tpl
  10. +1 −1  webapp/_lib/view/_post.counts_no_author.tpl
  11. +4 −5 webapp/_lib/view/_post.tpl
  12. +13 −8 webapp/_lib/view/_post.word-frequency.tpl
  13. +4 −5 webapp/_lib/view/_statusbar.tpl
  14. +1 −1  webapp/_lib/view/_user.tpl
  15. +8 −8 webapp/_lib/view/_usermessage.tpl
  16. +18 −18 webapp/_lib/view/account.appconfig.tpl
  17. +60 −59 webapp/_lib/view/account.index.tpl
  18. +69 −47 webapp/_lib/view/dashboard.tpl
  19. +88 −79 webapp/_lib/view/install.backup.tpl
  20. +3 −3 webapp/_lib/view/install.config.tpl
  21. +10 −7 webapp/_lib/view/install.exportserviceuser.tpl
  22. +2 −2 webapp/_lib/view/install.repair.tpl
  23. +5 −5 webapp/_lib/view/install.step1.tpl
  24. +29 −29 webapp/_lib/view/install.step2.tpl
  25. +4 −4 webapp/_lib/view/install.step3.tpl
  26. +17 −13 webapp/_lib/view/install.upgrade.tpl
  27. +1 −1  webapp/_lib/view/install.upgradeneeded.tpl
  28. +1 −1  webapp/_lib/view/plugins/insert.help_link.php
  29. +1 −1  webapp/_lib/view/post.export.tpl
  30. +41 −63 webapp/_lib/view/post.index.tpl
  31. +48 −42 webapp/_lib/view/session.login.tpl
  32. +17 −72 webapp/assets/css/base.css
  33. +20 −13 webapp/assets/css/installer.css
  34. +19 −19 webapp/assets/css/jquery-ui-1.7.1.custom.css
  35. +26 −26 webapp/assets/css/jquery-ui-1.8.13.css
  36. +1,153 −94 webapp/assets/css/style.css
  37. +2 −2 webapp/config.sample.inc.php
  38. +6 −3 webapp/plugins/expandurls/view/expandurls.account.index.tpl
  39. +51 −30 webapp/plugins/facebook/view/facebook.account.index.tpl
  40. +14 −13 webapp/plugins/facebook/view/facebook.inline.view.tpl
  41. +51 −24 webapp/plugins/facebook/view/friends.tpl
  42. +15 −5 webapp/plugins/facebook/view/posts.tpl
  43. +1 −1  webapp/plugins/geoencoder/model/class.GeoEncoderPlugin.php
  44. +10 −6 webapp/plugins/geoencoder/view/geoencoder.account.index.tpl
  45. +9 −4 webapp/plugins/geoencoder/view/geoencoder.map.tpl
  46. +3 −2 webapp/plugins/geoencoder/view/geoencoder.nearest.tpl
  47. +21 −11 webapp/plugins/googleplus/view/googleplus.account.index.tpl
  48. +31 −19 webapp/plugins/googleplus/view/googleplus.inline.view.tpl
  49. +14 −4 webapp/plugins/googleplus/view/posts.tpl
  50. +12 −8 webapp/plugins/hellothinkup/view/hellothinkup.account.index.tpl
  51. +8 −5 webapp/plugins/twitter/view/auth.tpl
  52. +105 −50 webapp/plugins/twitter/view/followers.tpl
  53. +11 −4 webapp/plugins/twitter/view/links.tpl
  54. +23 −7 webapp/plugins/twitter/view/tweets.tpl
  55. +18 −12 webapp/plugins/twitter/view/twitter.account.index.tpl
  56. +16 −18 webapp/plugins/twitter/view/twitter.inline.view.tpl
  57. +8 −9 webapp/plugins/twitter/view/twitter.post.retweets.tpl
  58. +31 −16 webapp/plugins/twitter/view/who_you_follow.tpl
  59. +8 −4 webapp/plugins/twitterrealtime/view/twitterrealtime.account.index.tpl
View
4 tests/WebTestOfPostDetailPage.php
@@ -88,9 +88,9 @@ public function testPostPageWithGeoencoderEnabled() {
$this->assertPattern('/Search/'); // we now allow search for non logged in users...
$this->assertText('Retweets');
$this->assertText('Response Map');
- $this->assertText('Nearest Responses');
+ $this->assertText('Nearest Replies');
- $this->click('Nearest responses');
+ $this->click('Nearest replies');
$this->assertTitle("Post Details | ThinkUp");
$this->assertText('This is post 10');
}
View
2  webapp/_lib/controller/class.InstallerController.php
@@ -335,7 +335,7 @@ private function step3() {
"</code><br /><code>chown $whoami " . escapeshellcmd(THINKUP_WEBAPP_PATH .
"config.inc.php") ."</code><br /><br />If you don't have root access, create the <code>" .
THINKUP_WEBAPP_PATH . "config.inc.php</code> file manually, and paste the following text into it.".
- "<br /><br />Click the <strong>Next Step</strong> button below once you did either.");
+ "<br /><br />Click the <strong>Next Step</strong> button below once you have done either.");
} else {
$this->addErrorMessage("ThinkUp couldn't write the <code>config.inc.php</code> file.<br /><br />".
"You will need to create the <code>" .
View
3  webapp/_lib/model/class.Installer.php
@@ -369,8 +369,7 @@ public function checkTable($config) {
// database contains at least 1 ThinkUp table
throw new InstallerException("<strong>Oops!</strong><br /> Looks like at least some of ThinkUp's ".
"database tables already exist. To install ThinkUp from scratch, drop its tables in the ".
- "<code style='font-family: Consolas,Monaco,Courier,monospace; border: 1px solid #999; ".
- "background-color: #ccc;'>{$config['db_name']}</code> database.<br />".
+ "<code>{$config['db_name']}</code> database.<br />".
"To repair your existing tables, click <a href=\"" . THINKUP_BASE_URL .
"install/index.php?step=repair&m=db\">here</a>.",
self::ERROR_DB_TABLES_EXIST);
View
6 webapp/_lib/view/_footer.tpl
@@ -1,11 +1,12 @@
- <div class="container small center">
+ <div class="small center" id="footer">
{if $linkify neq 'false'}
<script type="text/javascript" src="{$site_root_path}assets/js/linkify.js"></script>
{/if}
<div id="ft" role="contentinfo">
+ <div id="">
<p>
- <a href="http://thinkupapp.com">ThinkUp</a>{if $thinkup_version} beta {$thinkup_version}{/if}<br />
+ <a href="http://thinkupapp.com">ThinkUp</a>{if $thinkup_version} beta {$thinkup_version}{/if} |
<a href="http://thinkupapp.com/docs/">Documentation</a>
| <a href="http://groups.google.com/group/thinkupapp">Mailing List</a>
| <a href="http://webchat.freenode.net/?channels=thinkup">IRC Channel</a><br>
@@ -13,6 +14,7 @@
<br /> <br /><a href="http://twitter.com/thinkupapp"><img src="{$site_root_path}assets/img/favicon_twitter.png"></a>
<a href="http://facebook.com/thinkupapp"><img src="{$site_root_path}assets/img/favicon_facebook.png"></a>
</p>
+ </div>
</div> <!-- #ft -->
</div> <!-- .content -->
View
11 webapp/_lib/view/_header.tpl
@@ -32,7 +32,7 @@
// buttons functionality
$(function() {
//all hover and click logic for buttons
- $(".tt-button:not(.ui-state-disabled)")
+ $(".linkbutton:not(.ui-state-disabled)")
.hover(
function() {
$(this).addClass("ui-state-hover");
@@ -42,8 +42,8 @@
}
)
.mousedown(function() {
- $(this).parents('.tt-buttonset-single:first').find(".tt-button.ui-state-active").removeClass("ui-state-active");
- if ($(this).is('.ui-state-active.tt-button-toggleable, .tt-buttonset-multi .ui-state-active')) {
+ $(this).parents('.linkbuttonset-single:first').find(".linkbutton.ui-state-active").removeClass("ui-state-active");
+ if ($(this).is('.ui-state-active.linkbutton-toggleable, .linkbuttonset-multi .ui-state-active')) {
$(this).removeClass("ui-state-active");
}
else {
@@ -51,7 +51,7 @@
}
})
.mouseup(function() {
- if (! $(this).is('.tt-button-toggleable, .tt-buttonset-single .tt-button, .tt-buttonset-multi .tt-button') ) {
+ if (! $(this).is('.linkbutton-toggleable, .linkbuttonset-single .linkbutton, .linkbuttonset-multi .linkbutton') ) {
$(this).removeClass("ui-state-active");
}
});
@@ -67,8 +67,7 @@
margin: 8px auto;
height: 1px;
}
- .grid_4 a, .grid_10 a {color:#6184b5;}
- .thinkup-canvas a {color:#6184b5;}
+
</style>
{/literal}
View
9 webapp/_lib/view/_install.header.tpl
@@ -53,10 +53,9 @@
<link type="text/css" rel="stylesheet" href="{$site_root_path}assets/css/installer.css">
</head>
<body>
- <div id="status-bar">&nbsp;</div>
<div class="container clearfix">
- <div id="app-title">
- <h1><span class="bold">Think</span><span class="gray">Up</span></h1>
- <h2>New ideas</h2>
- </div>
+
+ <div id="app-title">
+ <h1><span id="headerthink">Think</span><span id="headerup">Up</span></h1>
+ </div>
</div>
View
2  webapp/_lib/view/_link.tpl
@@ -6,7 +6,7 @@
</div>
{/if}
-<div class="individual-tweet post clearfix">
+<div class="individual-tweet post clearfix article">
<div class="grid_1 alpha">
<a href="https://twitter.com/intent/user?user_id={$l->container_post->author_user_id}">
<img src="{$l->container_post->author_avatar}" class="avatar"/><img src="{$site_root_path}plugins/{$l->container_post->network|get_plugin_path}/assets/img/favicon.ico" class="service-icon"/></a>
View
5 webapp/_lib/view/_plugin.options.tpl
@@ -37,7 +37,7 @@ function show_advanced() {
<form id="plugin_option_form" onsubmit="return false;">
-<div class="ui-state-success ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em;display: none;" id="plugin_options_success">
+<div class="alert helpful" id="plugin_options_success" style="display: none;">
<p>
<span class="ui-icon ui-icon-check" style="float: left; margin:.3em 0.3em 0 0;"></span>
Saved!
@@ -45,8 +45,7 @@ function show_advanced() {
</div>
-<div id="plugin_option_server_error"
- class="ui-state-error ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em; display: none;">
+<div class="alert urgent" id="plugin_option_server_error" style="display: none;">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin:.3em 0.3em 0 0;"></span>
<span id="plugin_option_server_error_message"></span>
View
2  webapp/_lib/view/_post.author_no_counts.tpl
@@ -10,7 +10,7 @@ $username_link (optional) If set to 'internal', render username link to internal
$show_distance (optional) If set to 'true', show the location and reply/retweet distance from original post.
$unit (optional) If $show_distance='true', unit should be 'mi' or 'km' for miles or kilometers of distance.
*}
-<div class="clearfix">
+<div class="clearfix article">
<div class="individual-tweet post clearfix{if $post->is_protected} private{/if}">
<div class="grid_2 alpha">
<div class="avatar-container">
View
2  webapp/_lib/view/_post.counts_no_author.tpl
@@ -25,7 +25,7 @@ $show_favorites_instead_of_retweets (optional) If set or not false, show favorit
</div>
{/if}
-<div class="clearfix">
+<div class="clearfix article">
<div class="individual-tweet post clearfix{if $post->is_protected} private{/if}">
<div class="grid_13 alpha">
<div class="post">
View
9 webapp/_lib/view/_post.tpl
@@ -1,10 +1,9 @@
{if $smarty.foreach.foo.first}
-<div style="clear:all"></div>
-<br><br><br>
+
<div class="header clearfix">
<div class="grid_2 alpha">&#160;</div>
<div class="grid_3">&#160;</div>
- <div class="grid_9">&#160;</div>
+ <div class="grid_8">&#160;</div>
<div class="grid_2 center">
{if $t->network eq 'twitter'}retweets{else}{if $t->network eq 'google+'}+1's{else}likes{/if}{/if}
</div>
@@ -14,7 +13,7 @@
</div>
{/if}
-<div class="clearfix">
+<div class="clearfix article">
<div class="individual-tweet post clearfix{if $t->is_protected} private{/if}">
<div class="grid_2 alpha">
<div class="avatar-container">
@@ -35,7 +34,7 @@
<div class="small gray">{$t->author->follower_count|number_format} followers</div>
{/if}
</div>
- <div class="grid_9">
+ <div class="grid_8">
<div class="post">
{if $t->post_text}
{if $scrub_reply_username}
View
21 webapp/_lib/view/_post.word-frequency.tpl
@@ -1,16 +1,21 @@
-<div id="word-frequency-div">
+{if $post->reply_count_cache gt 19}
+<div id="word-frequency-div" class="section">
<div>
- <div id="word-frequency-list">
+ <h2>Most Popular Reply Keywords</h2>
+ <div id="word-frequency-list" class="article">
<div class="word-frequency-div" id="word-frequency-words">
</div>
+ <br style="clear : left;" />
</div>
</div>
- <div style="clear: both;"></div>
-</div>
-<div id="word-frequency-posts-div">
- <div align="right"><a href="#" onclick="return false;" id="word-frequency-close">
- <img src="{$site_root_path}assets/img/close-icon.gif" width="27" height="26" /></a></div>
- <div id="word-frequency-posts">
+ <div id="word-frequency-posts-div">
+ <a href="#" onclick="return false;" id="word-frequency-close" class="linkbutton help">
+ Close</a>
+ <div id="word-frequency-posts" style="">
+ </div>
</div>
+ <div style="clear: both;"></div>
</div>
+{/if}
+
View
9 webapp/_lib/view/_statusbar.tpl
@@ -45,16 +45,16 @@
Last update: {$crawler_last_run|relative_datetime} ago
{/if}
{/if}
- {if $instance} {if $logged_in_user} {if $instances|@count > 1 } | {/if} <a href="{$site_root_path}crawler/updatenow.php{if $developer_log}?log=full{/if}">Update now</a>{/if}{/if}
+ {if $instance} {if $logged_in_user} {if $instances|@count > 1 } {/if} <a href="{$site_root_path}crawler/updatenow.php{if $developer_log}?log=full{/if}" class="linkbutton">Update now</a>{/if}{/if}
</div> <!-- .status-bar-left -->
<div class="status-bar-right text-right">
<ul>
{if $logged_in_user}
- <li>Logged in as{if $user_is_admin} admin{/if}: {$logged_in_user} | {if $user_is_admin}<script src="{$site_root_path}install/checkversion.php"></script>{/if}<a href="{$site_root_path}account/?m=manage">Settings</a> | <a href="{$site_root_path}session/logout.php">Log Out</a></li>
+ <li>Logged in as{if $user_is_admin} admin{/if}: {$logged_in_user} {if $user_is_admin}<script src="{$site_root_path}install/checkversion.php"></script>{/if}<a href="{$site_root_path}account/?m=manage" class="linkbutton">Settings</a> <a href="{$site_root_path}session/logout.php" class="linkbutton">Log Out</a></li>
{else}
- <li><a href="http://thinkupapp.com/">Get ThinkUp</a> | <a href="{$site_root_path}session/login.php">Log In</a></li>
+ <li><a href="http://thinkupapp.com/" class="linkbutton">Get ThinkUp</a> <a href="{$site_root_path}session/login.php" class="linkbutton" >Log In</a></li>
{/if}
</ul>
</div> <!-- .status-bar-right -->
@@ -67,8 +67,7 @@
<div class="container clearfix">
<div id="app-title"><a href="{$site_root_path}{$logo_link}">
- <h1><span class="bold">Think</span><span class="gray">Up</span></h1>
- <h2>New ideas</h2>
+ <h1><span id="headerthink">Think</span><span id="headerup">Up</span></h1>
</a></div> <!-- end #app-title -->
</div> <!-- end .container -->
View
2  webapp/_lib/view/_user.tpl
@@ -1,4 +1,4 @@
-<div class="individual-tweet prepend_20 clearfix{if $t.is_protected} private{/if}">
+<div class="individual-tweet prepend_20 clearfix{if $t.is_protected} private{/if} article">
<div class="grid_2 alpha">
<div class="avatar-container">
{if $f.network == 'twitter'}<a href="https://twitter.com/intent/user?user_id={$f.user_id}" title="{$f.user_name} on Twitter">{/if}
View
16 webapp/_lib/view/_usermessage.tpl
@@ -1,14 +1,14 @@
{if $field}
{if $success_msgs.$field}
- <div class="ui-state-success ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em;">
+ <div class="alert helpful">
<p>
<span class="ui-icon ui-icon-check" style="float: left; margin:.3em 0.3em 0 0;"></span>
{$success_msgs.$field}
</p>
- </div>
+ </div>
{/if}
{if $error_msgs.$field}
- <div class="ui-state-error ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em;">
+ <div class="alert urgent">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin:.3em 0.3em 0 0;"></span>
{$error_msgs.$field}
@@ -17,7 +17,7 @@
{/if}
{if $info_msgs.$field}
{if $success_msgs.$field OR $error_msgs.$field}<br />{/if}
- <div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
+ <div class="alert stats" style="margin-top: 10px; padding: 0.5em 0.7em;">
<p>
<span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
{$info_msgs.$field}
@@ -26,15 +26,15 @@
{/if}
{else}
{if $success_msg}
- <div class="ui-state-success ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em;">
+ <div class="alert helpful" style="">
<p>
<span class="ui-icon ui-icon-check" style="float: left; margin:.3em 0.3em 0 0;"></span>
{$success_msg}
</p>
- </div>
+ </div>
{/if}
{if $error_msg}
- <div class="ui-state-error ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em;">
+ <div class="alert urgent" style="">
<p>
<span class="ui-icon ui-icon-alert" style="float: left; margin:.3em 0.3em 0 0;"></span>
{$error_msg}
@@ -43,7 +43,7 @@
{/if}
{if $info_msg}
{if $success_msg OR $error_msg}<br />{/if}
- <div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
+ <div class="alert helpful" style="margin-top: 10px; padding: 0.5em 0.7em;">
<p>
<span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
{$info_msg}
View
36 webapp/_lib/view/account.appconfig.tpl
@@ -8,21 +8,20 @@
</div>
</div>
-<div id="settings_error_message_error"
- class="ui-state-error ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em; display: none;">
- <p>
- <span class="ui-icon ui-icon-alert" style="float: left; margin:.3em 0.3em 0 0;"></span>
- <span id="settings_error_message"></span>
- </p>
+ <div class="alert urgent" id="settings_error_message_error" style="display: none;">
+ <p>
+ <span class="ui-icon ui-icon-alert" style="float: left; margin:.3em 0.3em 0 0;"></span>
+ <span id="settings_error_message"></span>
+ </p>
</div>
- <div class="ui-state-success ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em;display: none;" id="settings_success">
+
+ <div class="alert helpful" id="settings_success" style="display: none;">
<p>
<span class="ui-icon ui-icon-check" style="float: left; margin:.3em 0.3em 0 0;"></span>
Settings saved!
</p>
- </div>
-
+ </div>
<form id="app-settings-form" name="app_settings" method="post" action="{$site_root_path}session/app_settings.php"
onsubmit="return false">
@@ -39,7 +38,7 @@
<input type="checkbox" name="is_registration_open" id="is_registration_open" value="true">
</div>
<div style="clear:both;"></div>
- <div style="font-size: 10px; margin: 0px 0px 10px 0px;">
+ <div style="font-size: 12px; color : #555; margin: 0px 0px 10px 0px;">
Set whether or not your site's registration page is available and accepts new user registrations.
</div>
@@ -52,7 +51,7 @@
<input type="checkbox" name="recaptcha_enable" id="recaptcha_enable" value="true">
</div>
<div style="clear:both;"></div>
- <div style="font-size: 10px; margin: 0px 0px 10px 0px;">
+ <div style="font-size: 12px; color : #555; margin: 0px 0px 10px 0px;">
Select to enable reCAPTCHA, and <a href="https://www.google.com/recaptcha">get your reCAPTCHA keys here</a>.
</div>
@@ -77,17 +76,19 @@
</div>
<div style="float: left;">
+
<label for="is_api_disabled">
Disable the JSON API:
<br />
</label>
</div>
<div style="float: left;">
+ {insert name="help_link" id="api"}
<input type="checkbox" name="is_api_disabled" id="is_api_disabled" value="true">
</div>
<div style="clear:both;"></div>
- <div style="font-size: 10px; margin: 0px 0px 10px 0px;">
- Set whether or not your site's data is available via ThinkUp's JSON API. {insert name="help_link" id="api"}
+ <div style="font-size: 12px; color : #555; margin: 0px 0px 10px 0px;">
+ Set whether or not your site's data is available via ThinkUp's JSON API.
</div>
<div style="float: left;">
@@ -100,7 +101,7 @@
<input type="checkbox" name="is_embed_disabled" id="is_embed_disabled" value="true">
</div>
<div style="clear:both;"></div>
- <div style="font-size: 10px; margin: 0px 0px 10px 0px;">
+ <div style="font-size: 12px; color : #555; margin: 0px 0px 10px 0px;">
Set whether or not a user can embed a ThinkUp thread onto another web site.
</div>
@@ -119,7 +120,7 @@
</select>
</div>
<div style="clear:both;"></div>
- <div style="font-size: 10px; margin: 0px 0px 10px 0px;">
+ <div style="font-size: 12px; color : #555; margin: 0px 0px 10px 0px;">
Set the service user to display by default. {insert name="help_link" id="default_service_user"}
</div>
@@ -133,7 +134,7 @@
<input type="checkbox" name="is_log_verbose" id="is_log_verbose" value="true">
</div>
<div style="clear:both;"></div>
- <div style="font-size: 10px; margin: 0px 0px 10px 0px;">
+ <div style="font-size: 12px; color : #555; margin: 0px 0px 10px 0px;">
See the verbose, unformatted developer log on the Update Now screen.
</div>
</div>
@@ -146,9 +147,8 @@
<div class="clearfix">
<div class="grid_10 prefix_9 left">
<input type="submit" id="app-settings-save" name="Submit"
- class="tt-button ui-state-default ui-priority-secondary ui-corner-all" value="Save Settings">
+ class="linkbutton emphasized" value="Save Settings">
</div>
</div>
</form>
-
View
119 webapp/_lib/view/account.index.tpl
@@ -14,15 +14,16 @@
<div class="section thinkup-canvas clearfix" id="plugins">
<div class="alpha omega grid_22 prefix_1 clearfix prepend_20 append_20">
+
<div class="append_20 clearfix">
{include file="_usermessage.tpl" field="account"}
{if $installed_plugins}
{foreach from=$installed_plugins key=ipindex item=ip name=foo}
{if $smarty.foreach.foo.first}
<div class="clearfix header">
- <div class="grid_18 alpha">name</div>
+ <div class="grid_17 alpha">name</div>
{if $user_is_admin}
- <div class="grid_4 omega"></div>
+ <div class="grid_4 omega">activate</div>
{/if}
</div>
{/if}
@@ -38,16 +39,16 @@
{if $user_is_admin}
<div class="grid_4 omega">
<span id="spanpluginactivation{$ip->id}">
- <input type="submit" name="submit" class="tt-button ui-state-default ui-priority-secondary ui-corner-all btnToggle" id="{$ip->id}" value="{if $ip->is_active}Deactivate{else}Activate{/if}" />
+ <input type="submit" name="submit" class="linkbutton btnToggle" id="{$ip->id}" value="{if $ip->is_active}Deactivate{else}Activate{/if}" />
</span>
- <span style="display: none;padding:5px;" class='ui-state-success ui-corner-all mt_10' id="message{$ip->id}"></span>
+ <span style="display: none;padding:5px;" class='ui-state-success ui-corner-all mt_10' id="messageactive{$ip->id}"></span>
</div>
{/if}
</div>
{/if}
{/foreach}
{else}
- <a href="?m=manage" class="tt-button ui-state-default tt-button-icon-left ui-corner-all"><span class="ui-icon ui-icon-circle-arrow-w"></span>Back to plugins</a>
+ <a href="?m=manage" class="linkbutton">&laquo; Back to plugins</a>
{/if}
</div>
{if $body}
@@ -69,17 +70,19 @@
<script type="text/javascript" src="{$site_root_path}assets/js/appconfig.js"></script>
<div class="prepend_20">
- <div class="help-container">{insert name="help_link" id='backup'}</div>
+ {insert name="help_link" id='backup'}
<h1>Back Up and Export Data</h1>
<p><br />
- <a href="{$site_root_path}install/backup.php">Back up ThinkUp's entire database</a>
- <div style="font-size: 10px; margin: 0px 0px 10px 0px;">
- Recommended before upgrading ThinkUp.
+
+ <div style="margin: 0px 0px 30px 0px;">
+ <a href="{$site_root_path}install/backup.php" class="linkbutton emphasized">Back up ThinkUp's entire database</a>
+ <p style="padding-left : 20px; margin-top : 14px;">Recommended before upgrading ThinkUp.</p>
</div>
- <a href="{$site_root_path}install/exportuserdata.php">Export a single service user's data</a>
- <div style="font-size: 10px; margin: 0px 0px 10px 0px;">
- For transfer into another existing ThinkUp database.
+
+ <div style="margin: 0px 0px 30px 0px;">
+ <a href="{$site_root_path}install/exportuserdata.php" class="linkbutton emphasized">Export a single service user's data</a>
+ <p style="padding-left : 20px; margin-top : 14px;">For transfer into another existing ThinkUp database.</p>
</div>
</p>
</div>
@@ -91,22 +94,22 @@
<div class="thinkup-canvas clearfix">
<div class="alpha omega grid_22 prefix_1 clearfix prepend_20 append_20">
{include file="_usermessage.tpl" field='password'}
- <div class="help-container">{insert name="help_link" id='account'}</div>
+ {insert name="help_link" id='account'}
<h1>Password</h1><br />
<form name="changepass" method="post" action="index.php?m=manage#instances" class="prepend_20 append_20">
<div class="clearfix">
- <div class="grid_9 prefix_1 right"><label for="oldpass">Current password:</label></div>
- <div class="grid_9 left" style="overflow: hidden; margin: 0px 0px 10px 5px;">
+ <div class="grid_7 prefix_1 right"><label for="oldpass">Current password:</label></div>
+ <div class="grid_7 left" style="overflow: hidden; margin: 0px 0px 10px 5px;">
<input name="oldpass" type="password" id="oldpass">
{insert name="csrf_token"}<!-- reset password -->
</div>
</div>
<div class="clearfix">
- <div class="grid_9 prefix_1 right"><label for="pass1">New password:</label></div>
- <div class="grid_9 left">
+ <div class="grid_7 prefix_1 right"><label for="pass1">New password:</label></div>
+ <div class="grid_12 left">
<input name="pass1" type="password" id="pass1">
<br>
- <div class="ui-state-highlight ui-corner-all" style="margin: 10px 0px 10px 0px; padding: .5em 0.7em;">
+ <div class="alert helpful" style="margin: 10px 0px 10px 0px; padding: .5em 0.7em; min-height : 20px;">
<p>
<span class="ui-icon ui-icon-info" style="float: left; margin:.3em 0.3em 0 0;"></span>
8 characters with numbers and letters.
@@ -114,26 +117,26 @@
</div>
</div>
<div class="clearfix append_bottom">
- <div class="grid_9 prefix_1 right">
+ <div class="grid_7 prefix_1 right">
<label for="pass2">Re-type new password:</label>
</div>
- <div class="grid_9 left" style="overflow: hidden; margin: 0px 0px 10px 5px;">
+ <div class="grid_7 left" style="overflow: hidden; margin: 0px 0px 10px 5px;">
<input name="pass2" type="password" id="pass2">
</div>
</div>
- <div class="prefix_10 grid_9 left">
- <input type="submit" id="login-save" name="changepass" value="Change password" class="tt-button ui-state-default ui-priority-secondary ui-corner-all">
+ <div class="prefix_8 grid_7 left">
+ <input type="submit" id="login-save" name="changepass" value="Change password" class="linkbutton emphasized">
</div>
</div>
</form>
<br><br>
-<div class="help-container">{insert name="help_link" id='rss'}</div>
+{insert name="help_link" id='rss'}
<h1>Automate ThinkUp Crawls</h1><br />
<p>To set up ThinkUp to update automatically, subscribe to this secret RSS feed URL in your favorite news reader.</p>
<div style="text-align: center; padding: 20px 0px 20px 0px;width:100%;">
-<a href="{$rss_crawl_url}" class="tt-button ui-state-default tt-button-icon-right ui-corner-all"><span class="ui-icon ui-icon-circle-arrow-e"></span>Secret RSS Feed to Update ThinkUp</a>
+<a href="{$rss_crawl_url}" class="linkbutton emphasized">Secret RSS Feed to Update ThinkUp</a>
<div style="clear:all">&nbsp;<br><br><br></div>
</div>
@@ -174,29 +177,29 @@
<br /><br /><br/>
</p>
-<h1>Reset Your API Key</h1><br />
+<h1>Your API Key</h1><br />
{include file="_usermessage.tpl" field='api_key'}
-<p>Accidentally share your secret RSS URL? Reset your ThinkUp API key (and RSS feed URL) here.<br><br></p>
-
- <div style="text-align: center; border-top: solid gray 1px; padding: 20px 0px 20px 0px;">
+ <div style="padding: 20px 0px 20px 0px;">
<strong>Your Current ThinkUp API Key:</strong>
<span id="hidden_api_key" style="display: none;">{$owner->api_key}</span>
<span id="show_api_key">
- <a href="javascript:;" onclick="$('#show_api_key').hide(); $('#hidden_api_key').show();">
+ <a href="javascript:;" onclick="$('#show_api_key').hide(); $('#hidden_api_key').show();" class="linkbutton">
Click to view</a>
</span>
</div>
+<p>Accidentally share your secret RSS URL?</p>
+
<form method="post" action="index.php?m=manage#instances" class="prepend_20 append_20"
- style="border-top: solid gray 1px; padding: 20px 0px 0px 0px;" id="api-key-form">
+ style="padding: 20px 0px 0px 0px;" id="api-key-form">
<div class="grid_10 prefix_9 left">
<input type="hidden" name="reset_api_key" value="Reset API Key" />
<span id="apikey_conf" style="display: none;">
Don't forget! If you reset your API key, you will need to update your ThinkUp crawler RSS feed subscription. This action cannot be undone.
</span>
<input type="button" value="Reset Your API Key"
- class="tt-button ui-state-default ui-priority-secondary ui-corner-all"
+ class="linkbutton"
{literal}
onclick="if(confirm($('#apikey_conf').html().trim())) { $('#api-key-form').submit();}">
{/literal}
@@ -206,32 +209,31 @@
</div>
</div>
</div> <!-- end #instances -->
-
+
{if $user_is_admin}
- <div class="section" id="ttusers">
+ <div class="thinkup-canvas" id="ttusers">
- <div class="thinkup-canvas clearfix">
+ <div class="thinkup-canvas clearfix">
<div class="alpha omega grid_20 prefix_1 clearfix prepend_20 append_20">
<h1>Invite New User</h1>
{include file="_usermessage.tpl" field='invite'}
<form name="invite" method="post" action="index.php?m=manage#ttusers" class="prepend_20 append_20">
{insert name="csrf_token"}<input type="submit" id="login-save" name="invite" value="Create Invitation"
- class="tt-button ui-state-default ui-priority-secondary ui-corner-all">
+ class="linkbutton emphasized">
</form>
</div>
-
-
<div class="alpha omega grid_22 prefix_1 clearfix prepend_20 append_20">
- <h1>Registered Users</h1>
+ <h1>Registered Users</h1>
+
<div class="append_20 clearfix">
{foreach from=$owners key=oid item=o name=oloop}
{if $smarty.foreach.oloop.first}
<div class="clearfix header">
<div class="grid_14 alpha">name</div>
- <div class="grid_4">activation</div>
- <div class="grid_4 omega">administrator</div>
+ <div class="grid_3">activate</div>
+ <div class="grid_3 omega">admin</div>
</div>
{/if}
@@ -244,7 +246,7 @@
<br><br>Service users:
<span style="color:#666"><br><small>
{foreach from=$o->instances key=iid item=i}
- {$i->network_username} - {$i->network|capitalize}
+ {$i->network_username} | {$i->network|capitalize}
{if !$i->is_active} (paused){/if}<br>
{/foreach}
{else}
@@ -252,29 +254,28 @@
{/if}
</small></span>
</div>
- {if $user_is_admin}
<div class="grid_4">
{if $o->id neq $owner->id}
<span id="spanowneractivation{$o->id}">
- <input type="submit" name="submit" class="tt-button ui-state-default ui-priority-secondary ui-corner-all toggleOwnerActivationButton" id="user{$o->id}" value="{if $o->is_activated}Deactivate{else}Activate{/if}" />
+ <input type="submit" name="submit" class="linkbutton toggleOwnerActivationButton" id="user{$o->id}" value="{if $o->is_activated}Deactivate{else}Activate{/if}" />
</span>
- <span style="display: none;padding:5px;" class="ui-state-success ui-corner-all mt_10" id="messageactive{$o->id}"></span>
+ <span style="display: none;padding:5px;" class="ui-state-success ui-corner-all mt_10" id="messageowneractive{$o->id}"></span>
{/if}
</div>
<div class="grid_4 omega">
{if $o->id neq $owner->id && $o->is_activated}
<span id="spanowneradmin{$o->id}">
- <input type="submit" name="submit" class="tt-button ui-state-default ui-priority-secondary ui-corner-all toggleOwnerAdminButton" id="userAdmin{$o->id}" value="{if $o->is_admin}Demote{else}Promote{/if}" />
+ <input type="submit" name="submit" class="linkbutton toggleOwnerAdminButton" id="userAdmin{$o->id}" value="{if $o->is_admin}Demote{else}Promote{/if}" />
</span>
<span style="display: none;padding:5px;" class="ui-state-success ui-corner-all mt_10" id="messageadmin{$o->id}"></span>
{/if}
</div>
- {/if}
</div>
{/foreach}
</div>
</div>
+
</div> <!-- end .thinkup-canvas -->
</div> <!-- end #ttusers -->
{/if} <!-- end is_admin -->
@@ -372,8 +373,8 @@ $(function() {
data: dataString,
success: function() {
$('#spanpluginactivation' + u).css('display', 'none');
- $('#message' + u).html("Activated!").hide().fadeIn(1500, function() {
- $('#message' + u);
+ $('#messageactive' + u).html("Activated!").hide().fadeIn(1500, function() {
+ $('#messageactive' + u);
});
$('#spanpluginnamelink' + u).css('display', 'inline');
$('#' + u).val('Deactivate');
@@ -381,7 +382,7 @@ $(function() {
$('#' + u).removeClass('btnActivate');
$('#' + u).addClass('btnDectivate');
setTimeout(function() {
- $('#message' + u).css('display', 'none');
+ $('#messageactive' + u).css('display', 'none');
$('#spanpluginactivation' + u).hide().fadeIn(1500);
},
2000
@@ -399,8 +400,8 @@ $(function() {
data: dataString,
success: function() {
$('#spanpluginactivation' + u).css('display', 'none');
- $('#message' + u).html("Deactivated!").hide().fadeIn(1500, function() {
- $('#message' + u);
+ $('#messageactive' + u).html("Deactivated!").hide().fadeIn(1500, function() {
+ $('#messageactive' + u);
});
$('#spanpluginnamelink' + u).css('display', 'none');
$('#spanpluginnametext' + u).css('display', 'inline');
@@ -408,7 +409,7 @@ $(function() {
$('#' + u).removeClass('btnDeactivate');
$('#' + u).addClass('btnActivate');
setTimeout(function() {
- $('#message' + u).css('display', 'none');
+ $('#messageactive' + u).css('display', 'none');
$('#spanpluginactivation' + u).hide().fadeIn(1500);
},
2000
@@ -438,8 +439,8 @@ $(function() {
data: dataString,
success: function() {
$('#spanowneractivation' + u).css('display', 'none');
- $('#messageactive' + u).html("Activated!").hide().fadeIn(1500, function() {
- $('#messageactive' + u);
+ $('#messageowneractive' + u).html("Activated!").hide().fadeIn(1500, function() {
+ $('#messageowneractive' + u);
});
$('#spanownernamelink' + u).css('display', 'inline');
$('#user' + u).val('Deactivate');
@@ -448,7 +449,7 @@ $(function() {
$('#user' + u).addClass('btnDectivate');
$('#userAdmin' + u).show();
setTimeout(function() {
- $('#messageactive' + u).css('display', 'none');
+ $('#messageowneractive' + u).css('display', 'none');
$('#spanowneractivation' + u).hide().fadeIn(1500);
},
2000
@@ -468,8 +469,8 @@ $(function() {
data: dataString,
success: function() {
$('#spanowneractivation' + u).css('display', 'none');
- $('#messageactive' + u).html("Deactivated!").hide().fadeIn(150, function() {
- $('#messageactive' + u);
+ $('#messageowneractive' + u).html("Deactivated!").hide().fadeIn(150, function() {
+ $('#messageowneractive' + u);
});
$('#spanownernamelink' + u).css('display', 'none');
$('#spanownernametext' + u).css('display', 'inline');
@@ -478,7 +479,7 @@ $(function() {
$('#user' + u).addClass('btnActivate');
$('#userAdmin' + u).hide();
setTimeout(function() {
- $('#messageactive' + u).css('display', 'none');
+ $('#messageowneractive' + u).css('display', 'none');
$('#spanowneractivation' + u).hide().fadeIn(1500);
},
2000
@@ -568,4 +569,4 @@ $(function() {
{/literal}
</script>
-{include file="_footer.tpl" linkify="false"}
+{include file="_footer.tpl" linkify="false"}
View
116 webapp/_lib/view/dashboard.tpl
@@ -5,33 +5,30 @@
<div class="clearfix">
<!-- begin left nav -->
- <div class="grid_4 alpha omega" style="background-color:#e6e6e6">
- <div id="nav-sidebar">
+ <div class="grid_4 alpha omega">
+ <div id="nav">
+ {if $instance}
<ul id="top-level-sidenav">
- <li style="list-style: none">
+ {/if}
{if $instance}
- <ul>
- <li>
- <ul class="side-subnav">
- <li{if $smarty.get.v eq ''} class="currentview"{/if}><br />
+ <li{if $smarty.get.v eq ''} class="selected"{/if}>
<a href="{$site_root_path}index.php?u={$instance->network_username|urlencode}&n={$instance->network|urlencode}">Dashboard</a>
</li>
{/if}
{if $sidebar_menu}
{foreach from=$sidebar_menu key=smkey item=sidebar_menu_item name=smenuloop}
{if !$sidebar_menu_item->parent}
- <li{if $smarty.get.v eq $smkey OR $parent eq $smkey} class="currentview"{/if}>
+ <li{if $smarty.get.v eq $smkey OR $parent eq $smkey} class="selected"{/if}>
{* TODO: Remove this logic from the view *}
{if $parent eq $smkey}{assign var="parent_name" value=$sidebar_menu_item->name}{/if}
<a href="{$site_root_path}index.php?v={$smkey}&u={$instance->network_username|urlencode}&n={$instance->network|urlencode}">{$sidebar_menu_item->name}</a></li>
{/if}
{/foreach}
- </ul>
- </li>
- </ul>
+
{/if}
- </li>
+ {if $instance}
</ul>
+ {/if}
</div>
</div>
@@ -44,7 +41,7 @@
<!--begin public user dashboard-->
{if $user_details}
<div class="grid_18 alpha omega">
- <div class="clearfix dashboard-header round-all">
+ <div class="clearfix alert stats round-all" id="">
<div class="grid_2 alpha">
<div class="avatar-container">
<img src="{$user_details->avatar}" class="avatar2"/>
@@ -65,6 +62,7 @@
{include file=$data_template}
{else} <!-- else if $data_template -->
{if $hot_posts|@count > 3}
+ <div class="section">
<h2>Hot Posts</h2>
{foreach from=$hot_posts key=tid item=t name=foo}
{if $smarty.foreach.foo.index < 3}
@@ -75,9 +73,12 @@
{/if}
{/if}
{/foreach}
+ </div>
{else}
{if $recent_posts}
+ <div class="section">
<h2>Recent posts</h2>
+ <div class="article">
{foreach from=$recent_posts key=tid item=t name=foo}
{if $smarty.foreach.foo.index < 3}
{if $instance->network eq "twitter"}
@@ -87,14 +88,19 @@
{/if}
{/if}
{/foreach}
+ </div>
+ </div>
{else}
+ <div class="alert helpful">
No posts to display. {if $logged_in_user}Update your data and try again.{/if}
+ </div>
{/if}
{/if}
{if $hot_posts|@count > 3}
+ <div class="section">
<h2>Recent Activity</h2>
- <div class="clearfix">
+ <div class="clearfix article">
{foreach from=$hot_posts key=post_id item=post name=foo}
{assign var="ra_count" value="`$post->favlike_count_cache+$post->reply_count_cache+$post->all_retweets`"}
{if $ra_max < $ra_count}
@@ -102,15 +108,16 @@
{/if}
{/foreach}
{if $instance->network neq "twitter"}
- <img width="700" height="280" src="http://chart.googleapis.com/chart?chxs=0,,11&chxt=y&chxl=0:|{foreach from=$hot_posts|@array_reverse key=post_id item=post name=foo}{if $post->post_text}{$post->post_text|replace:'|':''|strip_tags|truncate:50|urlencode}{elseif $post->link->title}{$post->link->title|replace:'|':''|truncate:50|urlencode}{elseif $post->link->url}{$post->link->url|replace:'|':''|truncate:50|urlencode}{else}{$post->pub_date|date_format:"%b %e"}{/if}|{/foreach}&chd=t:{foreach from=$hot_posts key=post_id item=post name=foo}{if $post->favlike_count_cache > 0}{$post->favlike_count_cache}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}|{foreach from=$hot_posts key=post_id item=post name=foo}{if $post->reply_count_cache > 0}{$post->reply_count_cache}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chds=0,{$ra_max+5}&chbh=a&chco=FF9900,cccccc&&chdl={if $instance->network eq 'google+'}%2B1's{else}Likes{/if}|Replies&chs=700x280&cht=bhs&chm=N*s*,666666,-1,-1,11,,e:2:0">
+ <img width="680" height="280" src="http://chart.googleapis.com/chart?chxs=0,,11&chxt=y&chxl=0:|{foreach from=$hot_posts|@array_reverse key=post_id item=post name=foo}{if $post->post_text}{$post->post_text|replace:'|':''|strip_tags|truncate:50|urlencode}{elseif $post->link->title}{$post->link->title|replace:'|':''|truncate:50|urlencode}{elseif $post->link->url}{$post->link->url|replace:'|':''|truncate:50|urlencode}{else}{$post->pub_date|date_format:"%b %e"}{/if}|{/foreach}&chd=t:{foreach from=$hot_posts key=post_id item=post name=foo}{if $post->favlike_count_cache > 0}{$post->favlike_count_cache}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}|{foreach from=$hot_posts key=post_id item=post name=foo}{if $post->reply_count_cache > 0}{$post->reply_count_cache}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chds=0,{$ra_max+5}&chbh=a&chco=FF9900,cccccc&&chdl={if $instance->network eq 'google+'}%2B1's{else}Likes{/if}|Replies&chs=700x280&cht=bhs&chm=N*s*,666666,-1,-1,11,,e:2:0">
{else}
- <img width="700" height="280" src="http://chart.googleapis.com/chart?chxs=0,,11&chxt=y&chxl=0:|{foreach from=$hot_posts|@array_reverse key=post_id item=post name=foo}{$post->post_text|replace:'|':''|truncate:50|urlencode}|{/foreach}&chd=t:{foreach from=$hot_posts key=post_id item=post name=foo}{if $post->all_retweets > 0}{$post->all_retweets}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}|{foreach from=$hot_posts key=post_id item=post name=foo}{if $post->reply_count_cache > 0}{$post->reply_count_cache}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chds=0,{$ra_max+5}&chbh=a&chco=FF9900,cccccc&chdl=Retweets|Replies&chs=700x280&cht=bhs&chm=N*s*,666666,-1,-1,11,,e:2:0">
+ <img width="680" height="280" src="http://chart.googleapis.com/chart?chxs=0,,11&chxt=y&chxl=0:|{foreach from=$hot_posts|@array_reverse key=post_id item=post name=foo}{$post->post_text|replace:'|':''|truncate:50|urlencode}|{/foreach}&chd=t:{foreach from=$hot_posts key=post_id item=post name=foo}{if $post->all_retweets > 0}{$post->all_retweets}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}|{foreach from=$hot_posts key=post_id item=post name=foo}{if $post->reply_count_cache > 0}{$post->reply_count_cache}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chds=0,{$ra_max+5}&chbh=a&chco=FF9900,cccccc&chdl=Retweets|Replies&chs=700x280&cht=bhs&chm=N*s*,666666,-1,-1,11,,e:2:0">
{/if}
</div>
+ </div>
{/if}
{if $most_replied_to_1wk}
- <div class="clearfix">
+ <div class="section">
<h2>This Week's Most {if $instance->network eq 'google+'}Discussed{else}Replied-To{/if} Posts</h2>
{foreach from=$most_replied_to_1wk key=tid item=t name=foo}
{if $instance->network eq "twitter"}
@@ -123,7 +130,7 @@
{/if}
{if $most_faved_1wk}
- <div class="clearfix">
+ <div class="section">
<h2>This Week's Most {if $instance->network eq 'google+'}+1'ed{else}Liked{/if} Posts</h2>
{foreach from=$most_faved_1wk key=tid item=t name=foo}
{include file="_post.counts_no_author.tpl" post=$t headings="NONE" show_favorites_instead_of_retweets=true}
@@ -132,8 +139,8 @@
{/if}
{if $follower_count_history_by_day.history && $follower_count_history_by_week.history}
- <div class="clearfix">
- <div class="grid_9 alpha">
+
+ <div class="section">
<h2>
{if $instance->network eq 'twitter'}Followers {elseif $instance->network eq 'facebook page'}Fans {elseif $instance->network eq 'facebook'}Friends {/if}By Day
{if $follower_count_history_by_day.trend}
@@ -142,12 +149,14 @@
{/if}
</h2>
{if !$follower_count_history_by_day.history OR $follower_count_history_by_day.history|@count < 2}
- <br /><i>Not enough data to display chart</i>
+ <div class="alert helpful">Not enough data to display chart</div>
{else}
- <img width="350" height="200" src="http://chart.apis.google.com/chart?chs=350x200&chxt=x,y&chxl=0:|{foreach from=$follower_count_history_by_day.history key=tid item=t name=foo}{$tid|date_format:"%b %d"}|{/foreach}1:|{foreach from=$follower_count_history_by_day.y_axis key=tid item=t name=foo}{$t|number_format}{if !$smarty.foreach.foo.last}|{/if}{/foreach}&cht=bvs&chco=FF9900&chd=t:{foreach from=$follower_count_history_by_day.history key=tid item=t name=foo}{if $t > 0}{$t}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chbh=a&chds={$follower_count_history_by_day.min_count},{$follower_count_history_by_day.max_count}&chxr={$follower_count_history_by_day.min_count},{$follower_count_history_by_day.max_count}&chxs=1N*s*&chm=N*s*,666666,0,-1,10,,e::5" />
+ <div class="article">
+ <img width="680" height="200" src="http://chart.apis.google.com/chart?chs=680x200&chxt=x,y&chxl=0:|{foreach from=$follower_count_history_by_day.history key=tid item=t name=foo}{$tid|date_format:"%b %d"}|{/foreach}1:|{foreach from=$follower_count_history_by_day.y_axis key=tid item=t name=foo}{$t|number_format}{if !$smarty.foreach.foo.last}|{/if}{/foreach}&cht=bvs&chco=FF9900&chd=t:{foreach from=$follower_count_history_by_day.history key=tid item=t name=foo}{if $t > 0}{$t}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chbh=a&chds={$follower_count_history_by_day.min_count},{$follower_count_history_by_day.max_count}&chxr={$follower_count_history_by_day.min_count},{$follower_count_history_by_day.max_count}&chxs=1N*s*&chm=N*s*,666666,0,-1,10,,e::5" />
+ </div>
{/if}
</div>
- <div class="grid_9 omega">
+ <div class="section">
<h2>
{if $instance->network eq 'twitter'}Followers {elseif $instance->network eq 'facebook page'}Fans {elseif $instance->network eq 'facebook'}Friends {/if} By Week
{if $follower_count_history_by_week.trend != 0}
@@ -156,12 +165,14 @@
{/if}
</h2>
{if !$follower_count_history_by_week.history OR $follower_count_history_by_week.history|@count < 2}
- <br /><i>Not enough data to display chart</i><br clear="all"/>
+ <div class="alert helpful">Not enough data to display chart</div>
{else}
- <img width="350" height="200" src="http://chart.apis.google.com/chart?chs=350x200&chxt=x,y&chxl=0:|{foreach from=$follower_count_history_by_week.history key=tid item=t name=foo}{$tid|date_format:"%b %d"}|{/foreach}1:|{foreach from=$follower_count_history_by_week.y_axis key=tid item=t name=foo}{$t|number_format}{if !$smarty.foreach.foo.last}|{/if}{/foreach}&cht=bvs&chco=FF9900&chd=t:{foreach from=$follower_count_history_by_week.history key=tid item=t name=foo}{if $t > 0}{$t}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chbh=a&chds={$follower_count_history_by_week.min_count},{$follower_count_history_by_week.max_count}&chxr={$follower_count_history_by_week.min_count},{$follower_count_history_by_week.max_count}&chxs=1N*s*&chm=N*s*,666666,0,-1,10,,e::5" />
+ <div class="article">
+ <img width="680" height="200" src="http://chart.apis.google.com/chart?chs=680x200&chxt=x,y&chxl=0:|{foreach from=$follower_count_history_by_week.history key=tid item=t name=foo}{$tid|date_format:"%b %d"}|{/foreach}1:|{foreach from=$follower_count_history_by_week.y_axis key=tid item=t name=foo}{$t|number_format}{if !$smarty.foreach.foo.last}|{/if}{/foreach}&cht=bvs&chco=FF9900&chd=t:{foreach from=$follower_count_history_by_week.history key=tid item=t name=foo}{if $t > 0}{$t}{else}_{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chbh=a&chds={$follower_count_history_by_week.min_count},{$follower_count_history_by_week.max_count}&chxr={$follower_count_history_by_week.min_count},{$follower_count_history_by_week.max_count}&chxs=1N*s*&chm=N*s*,666666,0,-1,10,,e::5" />
+ </div>
{/if}
</div>
- </div>
+
{/if}
{if $follower_count_history_by_week.milestone}
@@ -172,20 +183,22 @@
{if $least_likely_followers}
<div class="clearfix">
<h2>This Week's Most Discerning Followers</h2>
- <div class="clearfix">
+ <div class="clearfix article" style="padding-top : 0px;">
{foreach from=$least_likely_followers key=uid item=u name=foo}
<div class="avatar-container" style="float:left;margin:7px;">
<a href="https://twitter.com/intent/user?user_id={$u.user_id}" title="{$u.user_name} has {$u.follower_count|number_format} followers and {$u.friend_count|number_format} friends"><img src="{$u.avatar}" class="avatar2"/><img src="{$site_root_path}plugins/{$u.network}/assets/img/favicon.ico" class="service-icon2"/></a>
</div>
{/foreach}
- <div class="clearfix small prepend">
- <br ><br >&nbsp;<a href="{$site_root_path}index.php?v=followers-leastlikely&u={$instance->network_username}&n={$instance->network}">More...</a></div>
+ <br /><br /><br />
+ </div>
+ <div class="clearfix view-all">
+ <a href="{$site_root_path}index.php?v=followers-leastlikely&u={$instance->network_username}&n={$instance->network}">More..</a>
</div>
</div>
{/if}
{if $most_retweeted_1wk}
- <div class="clearfix">
+ <div class="clearfix section">
<h2>This Week's Most {if $instance->network eq 'google+'}Reshared{else}Retweeted{/if}</h2>
{foreach from=$most_retweeted_1wk key=tid item=t name=foo}
{include file="_post.counts_no_author.tpl" post=$t show_favorites_instead_of_retweets=false}
@@ -193,23 +206,32 @@
</div>
{/if}
{if $instance->network eq 'twitter' && $recent_posts|@count > 0 }
- <div class="clearfix">
- <div class="public_user_stats">
- <div class="grid_8 alpha">
- <h2>Post Types</span></h2>
- <div class="clearfix small prepend">
- {$instance->percentage_replies|round}% posts are replies<br>
- {$instance->percentage_links|round}% posts contain links<br>
- </div>
- <img width="250" height="175" src="http://chart.apis.google.com/chart?chxt=x,y&cht=bhg&chd=t:{$instance->percentage_replies|round},{$instance->percentage_links|round}&chco=6184B5&chls=2.0&chs=250x175&chxl=0:|20%|60%|100%|1:|Broadcaster|Conversationalist&chxp=0,20,60,100&chbh=50" />
- </div>
- <div class="grid_8 omega">
+ <div class="section" style="float : left; clear : none; width : 314px;">
+ <div class="alpha">
+ <h2>Post Types</span></h2>
+ <div class="small prepend article">
+ <img width="250" height="175" src="http://chart.apis.google.com/chart?chxt=x,y&cht=bhg&chd=t:{$instance->percentage_replies|round},{$instance->percentage_links|round}&&chco=7CC0D7&chls=2.0&chs=250x175&chxl=0:|20%|60%|100%|1:|Broadcaster|Conversationalist&chxp=0,20,60,100&chbh=50" />
+ </div>
+ <div class="stream-pagination"><small style="color:#666;padding:5px;">
+ {$instance->percentage_replies|round}% posts are replies<br>
+ {$instance->percentage_links|round}% posts contain links
+ </small>
+ </div>
+ </div>
+ </div>
+
+ <div class="section" style="float : left; clear : none;margin-left : 10px; width : 380px;">
+ <div class="omega">
<h2>Client Usage <span class="detail">(all posts)</span></h2>
- <img width="400" height="200" src="http://chart.apis.google.com/chart?cht=p&chd=t:{foreach from=$all_time_clients_usage key=name item=num_posts name=foo}{if $num_posts>0}{math equation="round(x/y*100,2)" x=$num_posts y=$all_time_clients_usage|@array_sum}{else}0{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chs=400x200&chl={foreach from=$all_time_clients_usage key=name item=num_posts name=foo}{$name}+({$num_posts}){if !$smarty.foreach.foo.last}|{/if}{/foreach}&chco=6184B5,E6E6E6"><br /><br />
+ <div class="article">
+ <img width="350" height="200" src="http://chart.apis.google.com/chart?cht=p&chd=t:{foreach from=$all_time_clients_usage key=name item=num_posts name=foo}{if $num_posts>0}{math equation="round(x/y*100,2)" x=$num_posts y=$all_time_clients_usage|@array_sum}{else}0{/if}{if !$smarty.foreach.foo.last},{/if}{/foreach}&chs=350x200&chl={foreach from=$all_time_clients_usage key=name item=num_posts name=foo}{$name}+({$num_posts}){if !$smarty.foreach.foo.last}|{/if}{/foreach}&chco=7CC0D7,D5F0FC">
+ </div>
+ <div class="stream-pagination">
+ <small style="color:#666;padding:5px;">Recently posting about {$instance->posts_per_day|round} times a day{if $latest_clients_usage}, mostly using {foreach from=$latest_clients_usage key=name item=num_posts name=foo}{$name}{if !$smarty.foreach.foo.last} and {/if}{/foreach}{/if}</small>
+ </div>
</div>
- </div>
</div>
- <small>Recently posting about {$instance->posts_per_day|round} times a day{if $latest_clients_usage}, mostly using {foreach from=$latest_clients_usage key=name item=num_posts name=foo}{$name}{if !$smarty.foreach.foo.last} and {/if}{/foreach}{/if}</small>
+
{/if}
{/if} <!-- end if $data_template -->
{/if}
@@ -219,14 +241,14 @@
{if $add_user_buttons}
{foreach from=$add_user_buttons key=smkey item=button name=smenuloop}
<br><br>
- <div style="float:right;"><a href="{$site_root_path}account/?p={$button}" class="tt-button ui-state-default tt-button-icon-right ui-corner-all"><span class="ui-icon ui-icon-circle-arrow-e"></span>Add a {if $button eq 'googleplus'}Google+{else}{$button|ucwords}{/if} Account</a></div>
+ <div style="float:right;"><a href="{$site_root_path}account/?p={$button}" class="linkbutton emphasized">Add a {if $button eq 'googleplus'}Google+{else}{$button|ucwords}{/if} Account</a></div>
{/foreach}
{/if}
<br><br>
{if $logged_in_user}
- <div style="float:right;"><a href="{$site_root_path}account/" class="tt-button ui-state-default tt-button-icon-right ui-corner-all"><span class="ui-icon ui-icon-circle-arrow-e"></span>Adjust Your Settings</a></div>
+ <div style="float:right;"><a href="{$site_root_path}account/" class="linkbutton emphasized">Adjust Your Settings</a></div>
{else}
- <div style="float:right;"><a href="{$site_root_path}session/login.php" class="tt-button ui-state-default tt-button-icon-right ui-corner-all"><span class="ui-icon ui-icon-circle-arrow-e"></span>Log In</a></div>
+ <div style="float:right;"><a href="{$site_root_path}session/login.php" class="linkbutton emphasized">Log In</a></div>
{/if}
</div>
{/if}
View
167 webapp/_lib/view/install.backup.tpl
@@ -1,91 +1,100 @@
{include file="_header.tpl"}
{include file="_statusbar.tpl"}
- <div class="thinkup-canvas round-all container_24">
- <div class="clearfix prepend_20 append_20">
- <div class="grid_22 push_1 clearfix">
- {include file="_usermessage.tpl"}
-<div class="help-container">{insert name="help_link" id='backup'}</div>
-<h1>Back Up Your ThinkUp Data</h1>
-{if $no_zip_support}
-<div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
- <p>
- <span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
- It looks like your server setup does not support a library
- ( <a href="http://www.php.net/manual/en/book.zip.php">Zip</a> ) that is required to complete a backup
- through this interface.
- <br /><br />
- You can also try backing up your data using
- <a href="http://www.thegeekstuff.com/2008/09/backup-and-restore-mysql-database-using-mysqldump/">mysqldump</a>.
- </p>
-</div>
-{else}
- <p>
- Click on the button below to back up your ThinkUp database. This new ThinkUp feature is in testing;
- if it doesn't work, run a <a href="http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html">mysqldump</a> manually on your ThinkUp server.
- </p>
+<div class="container_24 thinkup-canvas round-all clearfix" style="margin-top : 10px;">
-{if $high_table_row_count}
-<!-- too many db records, use CLI interface? -->
-<div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
- <p>
- <span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
- Wow, your database has grown! The <b>{$high_table_row_count.table}</b> table has
- <b>{$high_table_row_count.count|number_format:0:".":","} rows</b>.
- Since backing up such a big database can time out in the browser, we recommend that you use the
- <a href="http://thinkupapp.com/docs/install/backup.html"><b>command line backup tool</b></a> when backing up ThinkUp.
- </p>
-</div>
-<br />
-{/if}
+ <div class="grid_18" style="margin-bottom : 20px; margin-left : 100px;">
+ {include file="_usermessage.tpl"}
+ </div>
-<input type="button" id="login-save" name="Submit" style="margin: 20px 0px 0px 20px;"
-onclick="document.location.href='?backup=true'"
-class="tt-button ui-state-default ui-priority-secondary ui-corner-all" value="Backup Now">
-<br /><br />
-<p><a href="javascript: history.go(-1)">&larr;Back</a></p>
+ <div class="clearfix prepend_20 append_20">
+ <div class="grid_22 push_1 clearfix alert stats">
-<br /><br />
+ <p><a href="javascript: history.go(-1)" class="linkbutton">&larr;Back</a></p>
+
+ {insert name="help_link" id='backup'}
+ <h1>Back Up Your ThinkUp Data</h1>
+
+ {if $no_zip_support}
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
+ <p>
+ <span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
+ It looks like your server setup does not support a library
+ ( <a href="http://www.php.net/manual/en/book.zip.php">Zip</a> ) that is required to complete a backup
+ through this interface.
+ <br /><br />
+ You can also try backing up your data using
+ <a href="http://www.thegeekstuff.com/2008/09/backup-and-restore-mysql-database-using-mysqldump/">mysqldump</a>.
+ </p>
+ </div>
+ {else}
+ <p>
+ Click on the button below to back up your ThinkUp database. This new ThinkUp feature is in testing;
+ if it doesn't work, run a <a href="http://dev.mysql.com/doc/refman/5.1/en/mysqldump.html">mysqldump</a> manually on your ThinkUp server.
+ </p>
+
+ {if $high_table_row_count}
+ <!-- too many db records, use CLI interface? -->
+ <div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
+ <p>
+ <span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
+ Wow, your database has grown! The <b>{$high_table_row_count.table}</b> table has
+ <b>{$high_table_row_count.count|number_format:0:".":","} rows</b>.
+ Since backing up such a big database can time out in the browser, we recommend that you use the
+ <a href="http://thinkupapp.com/docs/install/backup.html"><b>command line backup tool</b></a> when backing up ThinkUp.
+ </p>
+ </div>
+ <br />
+ {/if}
+
+ <input type="button" id="login-save" name="Submit" style="margin: 20px 0px 0px 20px;"
+ onclick="document.location.href='?backup=true'"
+ class="linkbutton emphasized" value="Backup Now">
+
+ <br /><br />
-<div class="prepend_20">
- <h1>Restore Your Thinkup Database</h1>
-</div>
-
- <p>
+
+ <br /><br />
+
+ <div class="prepend_20">
+ <h1>Restore Your Thinkup Database</h1>
+ </div>
+
+ <p>
Import a ThinkUp database from file by uploading it below.</p>
- </p>
-
-
-<form name="backup_form" id="backup-form" method="post" enctype="multipart/form-data"
-style="margin: 20px 0px 0px 20px;" action="{$site_root_path}install/backup.php">
-
- <div id="uploading-status" style="display: none;">
- <img src="{$site_root_path}assets/img/loading.gif" width="31" height="31" />
- </div>
-
- <label for="backup_file">
+ </p>
+
+
+ <form name="backup_form" id="backup-form" method="post" enctype="multipart/form-data"
+ style="margin: 20px 0px 50px 20px;" action="{$site_root_path}install/backup.php">
+
+ <div id="uploading-status" style="display: none;">
+ <img src="{$site_root_path}assets/img/loading.gif" width="31" height="31" />
+ </div>
+
+ <label for="backup_file">
Backup file:
- </label>
- &nbsp;
- <input type="file" name="backup_file" id="backup_file" />
- &nbsp;
- <input type="submit" id="upload-backup-submit" name="Submit" style="display: none;"
- class="tt-button ui-state-default ui-priority-secondary ui-corner-all" value="Upload Backup File">
-
-</form>
-
-<script type="text/javascript">
-{literal}
- $('#backup_file').click( function() { $('#upload-backup-submit').show(); } );
- $('#backup-form').submit( function() { $('#uploading-status').show() } );
-{/literal}
-</script>
-
-{/if}
-
-</div>
-</div>
+ </label>
+ &nbsp;
+ <input type="file" name="backup_file" id="backup_file" />
+ &nbsp;
+ <input type="submit" id="upload-backup-submit" name="Submit" style="display: none;"
+ class="linkbutton" value="Upload Backup File">
+
+ </form>
+
+ <script type="text/javascript">
+ {literal}
+ $('#backup_file').click( function() { $('#upload-backup-submit').show(); } );
+ $('#backup-form').submit( function() { $('#uploading-status').show() } );
+ {/literal}
+ </script>
+
+ {/if}
+
+ </div>
+ </div>
</div>
-{include file="_install.footer.tpl"}
+{include file="_footer.tpl"}
View
6 webapp/_lib/view/install.config.tpl
@@ -4,15 +4,15 @@
<div class="grid_22 push_1 clearfix">
{include file="_usermessage.tpl"}
- <textarea cols="120" rows="25">{$config_file_contents}</textarea><br>
+ <textarea style="width : 100%; margin-bottom : 30px;" rows="25">{$config_file_contents}</textarea><br>
<form name="form1" class="input" method="post" action="index.php?step=3">
{foreach from=$_POST key=k item=v}
<input type="hidden" name="{$k}" value="{$v}" />
{/foreach}
<div class="clearfix append_20">
- <div class="grid_10 prefix_9 left">
- <input type="submit" name="Submit" class="tt-button ui-state-default ui-priority-secondary ui-corner-all" value="Next Step &raquo">
+ <div class="grid_10 prefix_7 left">
+ <input type="submit" name="Submit" class="linkbutton ui-state-default ui-priority-secondary" value="Next Step &raquo">
</div></div></form>
</div>
</div>
View
17 webapp/_lib/view/install.exportserviceuser.tpl
@@ -1,17 +1,18 @@
{include file="_header.tpl"}
{include file="_statusbar.tpl"}
<div class="thinkup-canvas round-all container_24">
- <div class="clearfix prepend_20 append_20">
+ <div class="clearfix prepend_20 append_20 alert stats">
<div class="grid_22 push_1 clearfix">
+<p><a href="javascript: history.go(-1)" class="linkbutton">&larr;Back</a></p>
-<div class="help-container">{insert name="help_link" id='export_user_data'}</div>
+{insert name="help_link" id='export_user_data'}
<h1>Export Service User Data</h1>
{include file="_usermessage.tpl"}
{if $no_zip_support}
-<div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
+<div class="alert urgent" style="margin-top: 10px; padding: 0.5em 0.7em;">
<p>
<span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
It looks like your server setup does not support a library
@@ -20,8 +21,9 @@
</p>
</div>
{else}
+<div class="">
{if $messages}
- <div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
+ <div class="alert urgent" style="margin-top: 10px; padding: 0.5em 0.7em;">
<p>
<span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
{foreach from=$messages key=mid item=m}
@@ -36,13 +38,14 @@
<option value="{$i->id}">{$i->network_username} - {$i->network|capitalize} (updated {$i->crawler_last_run|relative_datetime} ago{if !$i->is_active} (paused){/if})</option>
{/foreach}
</select>
- <input type="submit" style="margin: 20px 0px 0px 20px;" class="tt-button ui-state-default ui-priority-secondary ui-corner-all" value="Export User Data">
+ <input type="submit" style="margin: 20px 0px 0px 20px;" class="linkbutton emphasized" value="Export User Data">
</form>
<br /><br />
{/if}
+</div>
{/if}
-<p><a href="javascript: history.go(-1)">&larr;Back</a></p>
+
</div>
</div>
</div>
-{include file="_install.footer.tpl"}
+{include file="_install.footer.tpl"}
View
4 webapp/_lib/view/install.repair.tpl
@@ -53,7 +53,7 @@
<div class="clearfix append_20">
<div class="grid_10 prefix_7 left">
- <input type="submit" name="repair" class="tt-button ui-state-default ui-priority-secondary ui-corner-all" value="Repair &raquo">
+ <input type="submit" name="repair" class="linkbutton ui-state-default ui-priority-secondary ui-corner-all" value="Repair &raquo">
</div>
</div>
</form>
@@ -61,4 +61,4 @@
</div>
</div>
</div>
-{include file="_install.footer.tpl"}
+{include file="_install.footer.tpl"}
View
10 webapp/_lib/view/install.step1.tpl
@@ -1,8 +1,8 @@
{include file="_install.header.tpl"}
<div class="container">
<div id="thinkup-tabs">
- <div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
- <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+ <div class="ui-tabs ui-widget ui-widget-content">
+ <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header alert stats">
<li id="step-tab-1" class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
<div class="key-stat install_step">
<h1>1</h1>
@@ -33,14 +33,14 @@
<h2 class="clearfix step_title">Check System Requirements</h2>
{if $requirements_met}
<div class="ui-state-success ui-corner-all" style="margin: 20px 0px; padding: 0.5em 0.7em;">
- <p>
+ <h2>
<span class="ui-icon ui-icon-check" style="float: left; margin:.3em 0.3em 0 0;"></span>
<strong>Great!</strong> Your system has everything it needs to run ThinkUp.
- </p>
+ </h2>
</div>
<div class="clearfix">
<div class="grid_10 prefix_8 left">
- <div class="next_step tt-button ui-state-default ui-priority-secondary ui-corner-all">
+ <div class="next_step linkbutton ui-state-default ui-priority-secondary">
<a href="index.php?step=2" style="color:black" id="nextstep">Let's Go &raquo;</a>
</div>
</div>
View
58 webapp/_lib/view/install.step2.tpl
@@ -1,8 +1,8 @@
{include file="_install.header.tpl"}
<div class="container">
<div id="thinkup-tabs">
- <div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
- <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+ <div class="ui-tabs ui-widget ui-widget-content">
+ <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header alert stats">
<li id="step-tab-1" class="ui-state-default ui-corner-top">
<div class="key-stat install_step">
<h1><span class="pass_step" id="pass-step-1">1</span></h1>
@@ -35,48 +35,48 @@
<h2 class="clearfix step_title">Create Your ThinkUp Account</h2>
<div class="clearfix append_20">
- <div class="grid_5 prefix_3 right">
+ <div class="grid_5 prefix_1 right">
<label>Name</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<input type="text" name="full_name" id="full_name"{if isset($full_name)} value="{$full_name}"{/if}>
</div>
</div>
<div class="clearfix append_20">
{include file="_usermessage.tpl" field="email"}
- <div class="grid_5 prefix_3 right">
+ <div class="grid_5 prefix_1 right">
<label>Email&nbsp;Address</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<input type="text" name="site_email" id="site_email"{if isset($site_email)} value="{$site_email}"{/if}>
</div>
</div>
<div class="clearfix append_20">
{include file="_usermessage.tpl" field="password"}
- <div class="grid_5 prefix_3 right">
+ <div class="grid_5 prefix_1 right">
<label>Choose&nbsp;Password</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<input type="password" name="password" id="password"{if isset($password)} value="{$password}"{/if}>
</div>
</div>
<div class="clearfix append_20">
- <div class="grid_6 prefix_2 right">
+ <div class="grid_6 prefix_0 right">
<label>Confirm Password</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<input type="password" name="confirm_password" id="confirm_password"{if isset($confirm_password)} value="{$confirm_password}"{/if}>
</div>
</div>
<div class="clearfix append_20">
{include file="_usermessage.tpl" field="timezone"}
- <div class="grid_6 prefix_2 right">
+ <div class="grid_6 prefix_0 right">
<label>Time Zone</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<select name="timezone" id="timezone" style="margin-top:1.25em">
<option value=""{if $current_tz eq ''} selected{/if}>Select a Time Zone:</option>
{foreach from=$tz_list key=group_name item=group}
@@ -108,10 +108,10 @@
<div class="clearfix append_20">
{include file="_usermessage.tpl" field="database"}
{include file="_usermessage.tpl" field="database_host"}
- <div class="grid_5 prefix_3 right">
+ <div class="grid_5 prefix_1 right">
<label>Database Host</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<input type="text" name="db_host" id="db_host"{if isset($db_host)} value="{$db_host}"{/if}>
<span class="input_information">This is usually <strong>localhost</strong> or a host name specified by
your hosting provider.</span>
@@ -121,30 +121,30 @@
<div class="clearfix append_20">
{include file="_usermessage.tpl" field="database_name"}
- <div class="grid_5 prefix_3 right">
+ <div class="grid_5 prefix_1 right">
<label>Database Name</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<input type="text" name="db_name" id="db_name"{if isset($db_name)} value="{$db_name}"{/if}>
<span class="input_information">If the database does not exist, ThinkUp will attempt to create it.</span>
</div>
</div>
<div class="clearfix append_20">
- <div class="grid_5 prefix_3 right">
+ <div class="grid_5 prefix_1 right">
<label>User Name</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<input type="text" name="db_user" id="db_user"{if isset($db_user)} value="{$db_user}"{/if}>
<span class="input_information">Your MySQL username.</span>
</div>
</div>
<div class="clearfix append_20">
- <div class="grid_5 prefix_3 right">
+ <div class="grid_5 prefix_1 right">
<label>Password</label>
</div>
- <div class="grid_10 prefix_1 left">
+ <div class="grid_14 prefix_1 left">
<input type="password" name="db_passwd" id="db_passwd"{if isset($db_passwd)} value="{$db_passwd}"{/if}>
<span class="input_information">Your MySQL password.</span>
</div>
@@ -154,7 +154,7 @@
<a href="#">Advanced Options<span class="ui-icon ui-icon-circle-triangle-e"></span></a>
</h2>
<div id="database-advance-options">
- <div class="ui-state-highlight ui-corner-all" style="margin-top: 10px; padding: 0.5em 0.7em;">
+ <div class="alert urgent">
<p>
<span class="ui-icon ui-icon-info" style="float: left; margin: 0.3em 0.3em 0pt 0pt;"></span>
These options are only necessary for some sites. If you're not sure what you should enter here,
@@ -163,30 +163,30 @@
</div>
<div class="clearfix append_20">
- <div class="grid_5 prefix_3 right">
+ <div class="grid_5 prefix_1 right">
<label>Database Socket</label>