nesta-plugin-admin 0.0.2 → 0.0.3

data/HISTORY.md

@@ -0,0 +1,13 @@
+# 0.0.3
+
+* Added theme overrides.
+
+
+# 0.0.2
+
+* Simplified default interface to work with more themes.
+
+
+# 0.0.1
+
+* Initial release.

data/README.md

@@ -4,10 +4,20 @@
 
 An Admin interface for Nesta allowing currently allowing the following:
 
-> Note: This is U-G-L-Y, as far as interfaces go. I am not an interface person.
-> If you would like a cleaner, prettier interface, feel free to fork and update.
-> If you do, please submit a pull request to me, I would like to make it better
-> looking.
+#### Note on the default admin interface
+This is U-G-L-Y, as far as interfaces go. I am not an interface person.
+If you would like a cleaner, prettier interface, feel free to fork and update.
+If you do, please submit a pull request to me, I would like to make it better
+looking.
+
+You can override this in two ways. 
+
+First, locally by adding templates to APP_ROOT/views, to use this, you must add 
+"admin_from_local: true" to your config/config.yml file.
+
+Second, via a theme by adding "admin_from_theme: true" to your config/config.yml
+file.
+
 
 ### Current Features:
 1. Create new pages.

data/doc/Nesta.html

@@ -110,7 +110,7 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/Nesta/AdminScreens.html

@@ -114,7 +114,7 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/Nesta/App.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:17 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/Nesta/Config.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/Nesta/Page.html

@@ -239,12 +239,12 @@ seemed to fix here within the context of  the Page module.</p>
       <pre class="lines">
 
 
+235
 236
-237
-238</pre>
+237</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 236</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 235</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_format'>format</span>
   <span class='ivar'>@format</span>
@@ -276,12 +276,12 @@ seemed to fix here within the context of  the Page module.</p>
       <pre class="lines">
 
 
+240
 241
-242
-243</pre>
+242</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 241</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 240</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_path_for_admin'>path_for_admin</span>
   <span class='kw'>return</span> <span class='lparen'>(</span><span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_path'>path</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span> <span class='op'>?</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>index</span><span class='tstring_end'>'</span></span> <span class='op'>:</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_path'>path</span><span class='rparen'>)</span>
@@ -306,13 +306,13 @@ seemed to fix here within the context of  the Page module.</p>
       <pre class="lines">
 
 
+236
 237
 238
-239
-240</pre>
+239</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 237</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 236</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_title_for_admin'>title_for_admin</span>
   <span class='id identifier rubyid_t'>t</span> <span class='op'>=</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_title'>title</span><span class='period'>.</span><span class='id identifier rubyid_gsub'>gsub</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'> - </span><span class='embexpr_beg'>#{</span><span class='const'>Nesta</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_title'>title</span><span class='rbrace'>}</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span>
@@ -328,7 +328,7 @@ seemed to fix here within the context of  the Page module.</p>
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:17 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/Nesta/Plugin.html

@@ -108,7 +108,7 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/Nesta/Plugin/Admin.html

@@ -104,7 +104,7 @@
         <dt id="VERSION-constant" class="">VERSION =
           
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.0.2</span><span class='tstring_end'>&quot;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.0.3</span><span class='tstring_end'>&quot;</span></span></pre></dd>
       
     </dl>
   
@@ -378,12 +378,12 @@ plugin -- of which I may write.</p>
       <pre class="lines">
 
 
-97
-98
-99</pre>
+88
+89
+90</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 97</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 88</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span> <span class='id identifier rubyid_path'>path</span>
   <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_full_path'>full_path</span><span class='lparen'>(</span><span class='id identifier rubyid_path'>path</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span>
@@ -419,17 +419,17 @@ plugin -- of which I may write.</p>
       <pre class="lines">
 
 
-146
-147
-148
-149
-150
-151
-152
-153</pre>
+137
+138
+139
+140
+141
+142
+143
+144</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 146</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 137</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_expire_caches'>expire_caches</span>
   <span class='const'>Nesta</span><span class='op'>::</span><span class='const'>Page</span><span class='period'>.</span><span class='id identifier rubyid_purge_cache'>purge_cache</span>
@@ -504,21 +504,21 @@ plugin -- of which I may write.</p>
       <pre class="lines">
 
 
+123
+124
+125
+126
+127
+128
+129
+130
+131
 132
 133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143</pre>
+134</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 132</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 123</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_full_path'>full_path</span> <span class='id identifier rubyid_path'>path</span>
   <span class='id identifier rubyid_path'>path</span><span class='period'>.</span><span class='id identifier rubyid_gsub!'>gsub!</span><span class='lparen'>(</span><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^\/</span><span class='regexp_end'>/</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span>
@@ -563,12 +563,12 @@ plugin -- of which I may write.</p>
       <pre class="lines">
 
 
-110
-111
-112</pre>
+101
+102
+103</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 110</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 101</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_load_menu'>load_menu</span>
   <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_open'>open</span><span class='lparen'>(</span><span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_menu_path'>menu_path</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>r</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_read'>read</span>
@@ -624,13 +624,13 @@ plugin -- of which I may write.</p>
       <pre class="lines">
 
 
-104
-105
-106
-107</pre>
+95
+96
+97
+98</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 104</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 95</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_load_raw'>load_raw</span> <span class='id identifier rubyid_path'>path</span>
   <span class='id identifier rubyid_path'>path</span><span class='comma'>,</span> <span class='id identifier rubyid_format'>format</span> <span class='op'>=</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_full_path'>full_path</span><span class='lparen'>(</span><span class='id identifier rubyid_path'>path</span><span class='rparen'>)</span>
@@ -687,12 +687,12 @@ plugin -- of which I may write.</p>
       <pre class="lines">
 
 
-124
-125
-126</pre>
+115
+116
+117</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 124</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 115</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_menu_path'>menu_path</span>
   <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_expand_path'>expand_path</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>menu.txt</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span> <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_join'>join</span><span class='lparen'>(</span> <span class='const'>Nesta</span><span class='op'>::</span><span class='const'>Env</span><span class='period'>.</span><span class='id identifier rubyid_root'>root</span><span class='comma'>,</span> <span class='const'>Nesta</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_content_path'>content_path</span> <span class='rparen'>)</span><span class='rparen'>)</span>
@@ -771,16 +771,16 @@ plugin -- of which I may write.</p>
       <pre class="lines">
 
 
-86
-87
-88
-89
-90
-91
-92</pre>
+77
+78
+79
+80
+81
+82
+83</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 86</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 77</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_write'>write</span> <span class='id identifier rubyid_path'>path</span><span class='comma'>,</span> <span class='id identifier rubyid_params'>params</span>
   <span class='id identifier rubyid_path'>path</span><span class='period'>.</span><span class='id identifier rubyid_gsub!'>gsub!</span><span class='lparen'>(</span><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^\/</span><span class='regexp_end'>/</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span>
@@ -840,12 +840,12 @@ plugin -- of which I may write.</p>
       <pre class="lines">
 
 
-117
-118
-119</pre>
+108
+109
+110</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 117</span>
+      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 108</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_write_menu'>write_menu</span> <span class='id identifier rubyid_params'>params</span>
   <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_open'>open</span><span class='lparen'>(</span><span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_menu_path'>menu_path</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>w</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_file'>file</span><span class='op'>|</span> <span class='id identifier rubyid_file'>file</span><span class='period'>.</span><span class='id identifier rubyid_puts'>puts</span> <span class='id identifier rubyid_params'>params</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>contents</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span> <span class='rbrace'>}</span>
@@ -860,7 +860,7 @@ plugin -- of which I may write.</p>
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/Nesta/Plugin/Admin/Helpers.html

@@ -102,31 +102,6 @@
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#admin_haml-instance_method" title="#admin_haml (instance method)">- (String) <strong>admin_haml</strong>(template, options = {}) </a>
-    
-
-    
-  </span>
-  
-  
-  
-  
-  
-  
-  
-
-  
-    <span class="summary_desc"><div class='inline'>
-<p>Override standard haml call to include special view location for  admin
-templates.</p>
-</div></span>
-  
-</li>
-
-      
-        <li class="public ">
-  <span class="summary_signature">
-    
       <a href="#authorized%3F-instance_method" title="#authorized? (instance method)">- (Boolean) <strong>authorized?</strong> </a>
     
 
@@ -237,69 +212,7 @@ it's a middleware.</p>
 
     
       <div class="method_details first">
-  <h3 class="signature first" id="admin_haml-instance_method">
-  
-    - (<tt>String</tt>) <strong>admin_haml</strong>(template, options = {}) 
-  
-
-  
-
-  
-</h3><div class="docstring">
-  <div class="discussion">
-    
-<p>Override standard haml call to include special view location for  admin
-templates.</p>
-
-<p>This can be overriden by themes which contain admin.haml and/or edit.haml</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-<p class="tag_title">Returns:</p>
-<ul class="return">
-  
-    <li>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>rendered html from haml</p>
-</div>
-      
-    </li>
-  
-</ul>
-
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-70
-71
-72</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/nesta-plugin-admin/init.rb', line 70</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_admin_haml'>admin_haml</span> <span class='id identifier rubyid_template'>template</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='op'>=</span><span class='lbrace'>{</span><span class='rbrace'>}</span>
-  <span class='id identifier rubyid_haml'>haml</span> <span class='id identifier rubyid_template'>template</span><span class='comma'>,</span> <span class='lbrace'>{</span> <span class='label'>views:</span> <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_expand_path'>expand_path</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>../../views</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_dirname'>dirname</span><span class='lparen'>(</span><span class='kw'>__FILE__</span><span class='rparen'>)</span><span class='rparen'>)</span> <span class='rbrace'>}</span><span class='period'>.</span><span class='id identifier rubyid_merge'>merge</span><span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
-</div>
-    
-      <div class="method_details ">
-  <h3 class="signature " id="authorized?-instance_method">
+  <h3 class="signature first" id="authorized?-instance_method">
   
     - (<tt>Boolean</tt>) <strong>authorized?</strong> 
   
@@ -563,7 +476,7 @@ it's a middleware.</p>
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/_index.html

@@ -182,7 +182,7 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/file.README.html

@@ -67,10 +67,20 @@
 
 <p>An Admin interface for Nesta allowing currently allowing the following:</p>
 
-<blockquote><p>Note: This is U-G-L-Y, as far as interfaces go. I am not an interface person.
+<h4>Note on the default admin interface</h4>
+
+<p>This is U-G-L-Y, as far as interfaces go. I am not an interface person.
 If you would like a cleaner, prettier interface, feel free to fork and update.
 If you do, please submit a pull request to me, I would like to make it better
-looking.</p></blockquote>
+looking.</p>
+
+<p>You can override this in two ways.</p>
+
+<p>First, locally by adding templates to APP_ROOT/views, to use this, you must add
+"admin_from_local: true" to your config/config.yml file.</p>
+
+<p>Second, via a theme by adding "admin_from_theme: true" to your config/config.yml
+file.</p>
 
 <h3>Current Features:</h3>
 
@@ -151,7 +161,7 @@ looking.</p></blockquote>
 </div></div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/index.html

@@ -67,10 +67,20 @@
 
 <p>An Admin interface for Nesta allowing currently allowing the following:</p>
 
-<blockquote><p>Note: This is U-G-L-Y, as far as interfaces go. I am not an interface person.
+<h4>Note on the default admin interface</h4>
+
+<p>This is U-G-L-Y, as far as interfaces go. I am not an interface person.
 If you would like a cleaner, prettier interface, feel free to fork and update.
 If you do, please submit a pull request to me, I would like to make it better
-looking.</p></blockquote>
+looking.</p>
+
+<p>You can override this in two ways.</p>
+
+<p>First, locally by adding templates to APP_ROOT/views, to use this, you must add
+"admin_from_local: true" to your config/config.yml file.</p>
+
+<p>Second, via a theme by adding "admin_from_theme: true" to your config/config.yml
+file.</p>
 
 <h3>Current Features:</h3>
 
@@ -151,7 +161,7 @@ looking.</p></blockquote>
 </div></div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/doc/method_list.html

@@ -47,14 +47,6 @@
         
 
   <li class="r1 ">
-    <span class='object_link'><a href="Nesta/Plugin/Admin/Helpers.html#admin_haml-instance_method" title="Nesta::Plugin::Admin::Helpers#admin_haml (method)">#admin_haml</a></span>
-    
-      <small>Nesta::Plugin::Admin::Helpers</small>
-    
-  </li>
-  
-
-  <li class="r2 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin/Helpers.html#authorized%3F-instance_method" title="Nesta::Plugin::Admin::Helpers#authorized? (method)">#authorized?</a></span>
     
       <small>Nesta::Plugin::Admin::Helpers</small>
@@ -62,7 +54,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin.html#delete-class_method" title="Nesta::Plugin::Admin.delete (method)">delete</a></span>
     
       <small>Nesta::Plugin::Admin</small>
@@ -70,7 +62,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin.html#expire_caches-class_method" title="Nesta::Plugin::Admin.expire_caches (method)">expire_caches</a></span>
     
       <small>Nesta::Plugin::Admin</small>
@@ -78,7 +70,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Nesta/Page.html#format-instance_method" title="Nesta::Page#format (method)">#format</a></span>
     
       <small>Nesta::Page</small>
@@ -86,7 +78,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin.html#full_path-class_method" title="Nesta::Plugin::Admin.full_path (method)">full_path</a></span>
     
       <small>Nesta::Plugin::Admin</small>
@@ -94,7 +86,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin.html#load_menu-class_method" title="Nesta::Plugin::Admin.load_menu (method)">load_menu</a></span>
     
       <small>Nesta::Plugin::Admin</small>
@@ -102,7 +94,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin.html#load_raw-class_method" title="Nesta::Plugin::Admin.load_raw (method)">load_raw</a></span>
     
       <small>Nesta::Plugin::Admin</small>
@@ -110,7 +102,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin/Helpers.html#local_stylesheet_link_tag-instance_method" title="Nesta::Plugin::Admin::Helpers#local_stylesheet_link_tag (method)">#local_stylesheet_link_tag</a></span>
     
       <small>Nesta::Plugin::Admin::Helpers</small>
@@ -118,7 +110,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin.html#menu_path-class_method" title="Nesta::Plugin::Admin.menu_path (method)">menu_path</a></span>
     
       <small>Nesta::Plugin::Admin</small>
@@ -126,7 +118,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Nesta/Page.html#path_for_admin-instance_method" title="Nesta::Page#path_for_admin (method)">#path_for_admin</a></span>
     
       <small>Nesta::Page</small>
@@ -134,7 +126,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin/Helpers.html#path_to-instance_method" title="Nesta::Plugin::Admin::Helpers#path_to (method)">#path_to</a></span>
     
       <small>Nesta::Plugin::Admin::Helpers</small>
@@ -142,7 +134,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin/Helpers.html#protected%21-instance_method" title="Nesta::Plugin::Admin::Helpers#protected! (method)">#protected!</a></span>
     
       <small>Nesta::Plugin::Admin::Helpers</small>
@@ -150,7 +142,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Nesta/Page.html#title_for_admin-instance_method" title="Nesta::Page#title_for_admin (method)">#title_for_admin</a></span>
     
       <small>Nesta::Page</small>
@@ -158,7 +150,7 @@
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin.html#write-class_method" title="Nesta::Plugin::Admin.write (method)">write</a></span>
     
       <small>Nesta::Plugin::Admin</small>
@@ -166,7 +158,7 @@
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="Nesta/Plugin/Admin.html#write_menu-class_method" title="Nesta::Plugin::Admin.write_menu (method)">write_menu</a></span>
     
       <small>Nesta::Plugin::Admin</small>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Aug 24 02:46:16 2012 by
+  Generated on Fri Aug 24 13:14:36 2012 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.3).
 </div>

data/lib/nesta-plugin-admin/init.rb

@@ -61,15 +61,6 @@ module Nesta
           end
         end
 
-        # Override standard haml call to include special view location for 
-        # admin templates. 
-        #
-        # This can be overriden by themes which contain admin.haml and/or edit.haml
-        #
-        # @return [String] rendered html from haml
-        def admin_haml template, options={}
-          haml template, { views: File.expand_path('../../views', File.dirname(__FILE__)) }.merge(options)
-        end
       end
 
       ########################################################################
@@ -156,13 +147,21 @@ module Nesta
 
   # Adding username and password to settings list.
   class Config
-    @settings += %w[ username password ]
+    @settings += %w[ admin_from_local admin_from_theme username password ]
   end
 
   class AdminScreens < Sinatra::Base
     register Sinatra::Cache
     set :cache_enabled, false
 
+    if Nesta::Config.admin_from_theme
+      set :views, Nesta::Path.themes(Nesta::Config.theme, "views")
+    elsif Nesta::Config.admin_from_local
+      set :views, Nesta::Path.local("views")
+    else
+      set :views, File.expand_path("../../views", File.dirname(__FILE__))
+    end
+
     helpers Nesta::Plugin::Admin::Helpers
 
     before '/admin*' do
@@ -181,7 +180,7 @@ module Nesta
     get '/admin/new' do
       @action = "New Page"
       @path, @content = nil
-      admin_haml :edit
+      haml :edit
     end
 
     post '/admin/new' do
@@ -198,7 +197,7 @@ module Nesta
     get '/admin' do
       @action = "Pages"
       @pages = Nesta::Page.find_all.sort { |a,b| a.title_for_admin <=> b.title_for_admin }
-      admin_haml :admin
+      haml :admin
     end
 
     get '/admin/menu' do
@@ -206,7 +205,7 @@ module Nesta
       @path      = "menu"
       @format   = nil
       @content  = Nesta::Plugin::Admin.load_menu
-      admin_haml :edit
+      haml :edit
     end
 
     post '/admin/menu' do
@@ -224,7 +223,7 @@ module Nesta
       @action  = "Edit Template"
       @path    = File.join(params[:splat])
       @content, @format = Nesta::Plugin::Admin.load_raw @path
-      admin_haml :edit
+      haml :edit
     end
 
   end

data/lib/nesta-plugin-admin/version.rb

@@ -1,7 +1,7 @@
 module Nesta
   module Plugin
     module Admin
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/views/layout.haml

@@ -63,10 +63,10 @@
       }
   %body
     #container
-      = admin_haml :header, :layout => false
+      = haml :header, :layout => false
       %hr
       %br
       = yield
       %br
-      = admin_haml :footer, :layout => false
+      = haml :footer, :layout => false
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nesta-plugin-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -52,6 +52,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile