typus 3.1.0.rc14 → 3.1.0.rc15

data/.gitmodules

@@ -1,3 +1,6 @@
 [submodule "test/fixtures/rails_app"]
 	path = test/fixtures/rails_app
 	url = git@github.com:typus/demo.git
+[submodule "config/locales"]
+	path = config/locales
+	url = git@github.com:typus/locales.git

data/README.md

@@ -12,17 +12,17 @@ concentrate on your application instead of the bits to manage the system.
 
 > A category of people or things having common characteristics.
 
-You can try a demo [here][demo].
+You can try a demo [here][typus_demo].
 
 ## Key Features
 
 - Built-in Authentication and Access Control Lists.
 - CRUD and custom actions for your models on a clean interface.
-- Internationalized interface ([See available translations][locales])
+- Internationalized interface ([See available translations][typus_locales])
 - Customizable and extensible templates.
 - Integrated [paperclip][paperclip] and [dragonfly][dragonfly] attachments viewer.
 - Works with `Rails 3.1.X`.
-- Tested with latest versions of `1.8.7`, `ree`, `1.9.2` and `jruby`.
+- Tested with latest Rubies. (`1.8.7-p352`, `ree-1.8.7-2011.03`, `1.9.2-p290`, `jruby-1.6.3`)
 - Tested with `SQLite`, `MySQL` and `PostgreSQL`.
 
 ## Installing
@@ -42,17 +42,11 @@ Update your bundle, run the generator and start the application server:
 
 and go to <http://0.0.0.0:3000/admin>.
 
-## Development
-
-To clone repository and initialize submodules:
-
-    $ git clone --recursive git://github.com/typus/typus.git
-
 ## Links
 
 - [Documentation](https://github.com/typus/typus/wiki)
 - [Issues](https://github.com/typus/typus/issues)
-- [Source Code](http://github.com/typus/typus) and [RubyGems](http://rubygems.org/gems/typus)
+- [Source Code][typus] and [RubyGems][typus_gem]
 - [Mailing List](http://groups.google.com/group/typus)
 - [Contributors List](http://github.com/typus/typus/contributors)
 
@@ -79,9 +73,11 @@ To clone repository and initialize submodules:
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-[demo]: http://demo.typuscms.com/
+[typus]: http://github.com/typus/typus
+[typus_demo]: http://demo.typuscms.com/
+[typus_demo_code]: https://github.com/typus/demo
+[typus_locales]: https://github.com/typus/typus/tree/master/config/locales
+[typus_gem]: http://rubygems.org/gems/typus
 [paperclip]: http://rubygems.org/gems/paperclip
 [dragonfly]: http://rubygems.org/gems/dragonfly
-[rails]: http://rubyonrails.org/
-[code]: https://github.com/typus/typus/tree/master/test/fixtures/rails_app
-[locales]: https://github.com/typus/typus/tree/master/config/locales
+[rails]: http://rubyonrails.org/

data/Rakefile

@@ -7,8 +7,10 @@ task :default => :test
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/app/controllers/**/*_test.rb',
-                          'test/lib/support/*_test.rb',
-                          'test/config/*_test.rb']
+                          'test/app/models/**/*_test.rb',
+                          'test/app/mailers/**/*_test.rb',
+                          'test/config/*_test.rb',
+                          'test/lib/**/*_test.rb']
   t.verbose = true
 end
 
@@ -44,14 +46,14 @@ namespace :test do
 
 end
 
-namespace :demo do
+namespace :submodules do
 
-  desc "Update demo"
+  desc "Update submodules"
   task :update do
     system "git pull && git submodule update --init"
   end
 
-  desc "Upgrade demo"
+  desc "Upgrade submodules"
   task :upgrade do
     system "git submodule foreach 'git pull origin master'"
     system "git ci -m 'Updated submodules' ."

data/app/assets/javascripts/typus.js

@@ -3,5 +3,6 @@
 //= require jquery.fancybox-1.3.4.pack
 //= require jquery.searchField
 //= require jquery.tokeninput
+//= require js/jquery.formalize.min
 //= require typus/jquery.application
 //= require typus/application

data/app/assets/javascripts/typus/jquery.application.js

@@ -1,5 +1,3 @@
-var CKEDITOR_BASEPATH = '/assets/ckeditor/';
-
 $(document).ready(function() {
 
     $("#quicksearch").searchField();

data/app/assets/stylesheets/typus.css

@@ -1,8 +1,20 @@
 /*
 *= require jquery.fancybox-1.3.4
+*= require css/formalize
+*= require css/fluid
 *= require token-input
 *= require typus/reset
-*= require typus/screen
+*= require typus/layout
+*= require typus/defaults
+*= require typus/errors
+*= require typus/account
+*= require typus/header
+*= require typus/content
+*= require typus/sidebar
+*= require typus/footer
+*= require typus/tables
 *= require typus/pagination
+*= require typus/forms
+*= require typus/hacks
 *= require typus/application
 */

data/app/assets/stylesheets/typus/account.css

@@ -0,0 +1,53 @@
+#account {
+  background: #F3F3F3;
+}
+
+#account #wrapper {
+  margin: 10em auto;
+  width: 40em;
+}
+
+#account #box {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  background: #FFF;
+  border: 0.1em solid #D3D3D3;
+  padding: 1em 2em;
+  margin: 0 0 1em 0;
+}
+
+#account #box h1 {
+  margin: 0.5em 0;
+}
+
+#account #box ul {
+  margin: 1.5em 0 0.5em 0;
+}
+
+#account #box li {
+  margin: 1em 0;
+}
+
+#account #box input.text {
+  font-size: 2em;
+  padding: 0.25em;
+  width: 100%;
+}
+
+#account #box input.button {
+  margin: 0.5em 1em 0 0;
+}
+
+#account #footer {
+  font-size: 0.9em;
+  line-height: 1.8em;
+  text-align: center;
+}
+
+#account #footer a {
+  font-weight: bold;
+}
+
+#account #actions {
+  text-align: center;
+}

data/app/assets/stylesheets/typus/actions.css

@@ -0,0 +1,11 @@
+
+#content_wrapper ul.predefined_filters {
+  border-bottom: 1px solid #D3D3D3;
+  margin: -0.5em 0 0 0;
+  padding: 1em 0;
+}
+
+#content_wrapper ul.predefined_filters li {
+  display: inline;
+  margin: 0 0.5em 0 0;
+}

data/app/assets/stylesheets/typus/content.css

@@ -0,0 +1,92 @@
+#content {
+  margin: 0;
+  padding: 1em;
+}
+
+#content h2 {
+  font-size: 1.5em;
+  margin: 0.5em 0;
+}
+
+#content h2 small {
+  font-size: 0.75em;
+}
+
+#content h2 small a {
+  color: #666;
+}
+
+#content ol {
+  margin: 1em 2em;
+}
+
+#content ul {
+  margin: 0 1.5em;
+}
+
+#content li {
+  list-style: square;
+  line-height: 1.5em;
+}
+
+#content pre {
+  background: #000;
+  color: #FFF;
+  font-size: 1.5em;
+  margin: 1em 0;
+  overflow: auto;
+  padding: 1em;
+}
+
+#content blockquote {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  font-size: 1.25em;
+  font-family: georgia;
+  line-height: 1.5em;
+  margin: 1em 0;
+  padding: 0 1em;
+  border: 1px solid #AAA;
+}
+
+#content .filters {
+  border-bottom: 1px solid #D3D3D3;
+  height: 2em;
+  margin-bottom: 1em;
+  padding: 1em 0;
+}
+
+#content .filters ul {
+  margin: 0;
+}
+
+#content .filters ul li {
+  float: left;
+  list-style: none;
+  margin: 0 1em 0 0;
+}
+
+#content #search {
+  float: right;
+}
+
+#content #search ul li {
+  margin: 0;
+}
+
+#content ul.predefined_filters {
+  border-bottom: 1px solid #D3D3D3;
+  margin: -0.5em 0 0 0;
+  padding: 1em 0;
+}
+
+#content ul.predefined_filters li {
+  display: inline;
+  margin: 0 0.5em 0 0;
+}
+
+#content .actions {
+  font-size: 0.9em;
+  margin: 0.5em 0;
+  height: 1em;
+}

data/app/assets/stylesheets/typus/defaults.css

@@ -0,0 +1,31 @@
+html, body {}
+
+body {
+  font-family: "Lucida Grande", Sans-serif;
+  font-size: 75%;
+  height: 100%;
+}
+
+label { display: block; font-weight: bold; margin: 0 0 5px 0; }
+strong { font-weight: bold; }
+em { font-style: italic; }
+
+dl { margin: 14px 0 20px 0; }
+dt { font-weight: bold; }
+dd { font-size: 18px; margin: 0.25em 0 1em 0; }
+dd p { color: #000; }
+
+p {
+  color: #777;
+  line-height: 1.25em;
+  margin: 1em 0;
+}
+
+h1 { font-size: 2em; font-weight: normal; }
+h2 { font-weight: bold; }
+h3 { font-size: 1.25em; font-weight: bold; margin: 1em 0; }
+
+a,
+a:visited,
+a:link { color: #000; font-weight: normal; }
+a:hover { color: #333; text-decoration: underline!important; }

data/app/assets/stylesheets/typus/errors.css

@@ -0,0 +1,33 @@
+#errorExplanation,
+.alert,
+.notice {
+  padding: 0.8em;
+  margin: 1em 0;
+  border: 1px solid #ddd;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  line-height: 1.5em;
+}
+
+#errorExplanation p,
+#errorExplanation li,
+#errorExplanation h3 {
+  color: #D12F19;
+}
+
+#errorExplanation h3 { margin: 5px 0 0 0; }
+
+#errorExplanation ul { margin: 10px 0 0 20px!important; }
+
+#errorExplanation,
+.alert { background: #FBE3E4; border-color: #FBC2C4; color: #D12F19; }
+.alert a { color: #D12F19; text-decoration: underline; }
+
+.notice { background: #FFF6BF; border-color: #FFD324; color: #817134; }
+.notice a { color: #817134; text-decoration: underline; }
+
+.fieldWithErrors label { color: #CD0A0A;}
+.fieldWithErrors input { background: #FEF8F6; }
+
+#errorExplanation ul { margin: 1em 1.5em; }
+#errorExplanation ul li { list-style: square!important; margin: 0!important; }

data/app/assets/stylesheets/typus/footer.css

@@ -0,0 +1,8 @@
+#footer {
+  padding: 1em;
+}
+
+#footer .copyright {
+  display: none;
+  font-size: 0.80em;
+}

data/app/assets/stylesheets/typus/forms.css

@@ -0,0 +1,52 @@
+fieldset {
+  margin: 0;
+  padding: 0;
+}
+
+fieldset ol {
+  margin: 0!important;
+}
+
+fieldset ol li {
+  list-style: none!important;
+  margin: 1em 0!important;
+}
+
+fieldset small {
+  font-size: 0.9em;
+  font-weight: normal;
+  margin: 0 0 0 0.25em;
+}
+
+fieldset small a {
+  text-decoration: none;
+}
+
+fieldset.inputs {}
+
+  fieldset.inputs input[type='text'],
+  fieldset.inputs input[type='password'] {
+    font-size: 1.25em;
+    width: 100%;
+  }
+
+  fieldset.inputs textarea {
+    font-size: 1.25em;
+    padding: 3px;
+  }
+
+  fieldset.inputs select {
+    font-size: 1.25em;
+  }
+
+  fieldset.inputs label.inline_label {
+    display: inline;
+  }
+
+fieldset.buttons {
+  margin-top: 1.5em;
+}
+
+  fieldset.buttons ol li {
+    display: inline;
+  }

data/app/assets/stylesheets/typus/hacks.css

@@ -0,0 +1,20 @@
+.box {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  background: #FFF;
+  border: 1px solid #AAA;
+  margin: 1em 0;
+  padding: 0.5em 1em ;
+}
+
+.box h3 {
+  margin: 0.5em 0!important;
+}
+
+.clear {
+  clear: both;
+}
+
+.box_relationships {
+  margin-top: 2.5em;
+}

data/app/assets/stylesheets/typus/header.css

@@ -0,0 +1,55 @@
+#header {
+  background: #4A525A;
+  padding: 1.25em 1em;
+}
+
+#header .title {
+  margin-bottom: 1.5em;
+}
+
+#header .title h1 a {
+  text-decoration: none;
+}
+
+#header .title h1 a:hover {
+  text-decoration: underline;
+}
+
+#header .title,
+#header .title h1 a,
+#header .applications,
+#header .applications a,
+#header .profile,
+#header .profile a {
+  color: #FFF;
+}
+
+#header ul li {
+  display: inline;
+}
+
+#header .applications ul li {
+  padding-right: 0.25em;
+}
+
+#header .applications ul li a {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  background: #242527;
+  padding: 3px 5px;
+  text-decoration: none;
+}
+
+#header .applications ul li a.active,
+#header .applications ul li a:hover {
+  background: #FFF;
+  color: #000;
+}
+
+#header .profile {
+  text-align: right;
+}
+
+#header .profile ul li {
+  padding-left: 0.5em;
+}