Browse Source

Fixed formatting issues with templates and adjusted comment in hook_update_N to remove @ingroup tags as those show up when drush updatedb is run

Stephen Ficklin 11 years ago
parent
commit
4ceabfdb8e

+ 2 - 1
tripal_analysis/theme/tripal_analysis/tripal_analysis_base.tpl.php

@@ -21,7 +21,8 @@ $rows = array();
 $rows[] = array(
   array(
     'data' => 'Analysis Name',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $analysis->name
 );

+ 0 - 1
tripal_bulk_loader/tripal_bulk_loader.install

@@ -247,7 +247,6 @@ function tripal_bulk_loader_update_6152() {
  * Update to 7.x-2.0
  * -Cast tripal_bulk_loader.template_id to int field
  *
- * @ingroup tripal_bulk_loader
  */
 function tripal_bulk_loader_update_7200() {
 

+ 2 - 1
tripal_contact/theme/tripal_contact/tripal_contact_base.tpl.php

@@ -20,7 +20,8 @@ $rows = array();
 $rows[] = array(
   array(
     'data' => 'Name',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $contact->name,
 );

+ 0 - 1
tripal_contact/tripal_contact.install

@@ -226,7 +226,6 @@ function tripal_contact_add_custom_tables(){
 /**
  * This is the required update for tripal_contact when upgrading from Drupal core API 6.x.
  *
- * @ingroup tripal_contact
  */
 function tripal_contact_update_7200() {
 

+ 3 - 3
tripal_core/theme/css/tripal.css

@@ -213,12 +213,12 @@ div.messages.tripal-site-admin-only{
 }
 
 .tripal-site-admin-message {
-   padding: 15px 10px 10px 70px;
-   font-style: italic;
+  padding: 15px 10px 10px 70px;
+  font-style: italic;
 }
 
 .tripal-site-admin-only-table-row {
   background-color: #cce3ff;
-  border: 1px solid #7DA1D4;
+  /* border: 1px solid #7DA1D4; */
   color: black;
 }

+ 2 - 1
tripal_feature/theme/tripal_feature/tripal_feature_base.tpl.php

@@ -20,7 +20,8 @@ $rows = array();
 $rows[] = array(
   array(
     'data' => 'Name',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $feature->name
 );

+ 1 - 0
tripal_feature/tripal_feature.install

@@ -214,6 +214,7 @@ function tripal_feature_add_organism_count_mview() {
 
 /**
  * This is the required update for tripal_feature when upgrading from Drupal core API 6.x.
+ * This update may take some time to complete.
  */
 function tripal_feature_update_7200() {
   // During the upgrade from D6 to D7 the vocabulary terms assigned to features were 

+ 2 - 1
tripal_featuremap/theme/tripal_featuremap/tripal_featuremap_base.tpl.php

@@ -24,7 +24,8 @@ $rows = array();
 $rows[] = array(
   array(
     'data' => 'Map Name',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $featuremap->name
 );

+ 2 - 1
tripal_library/theme/tripal_library/tripal_library_base.tpl.php

@@ -25,7 +25,8 @@ $rows = array();
 $rows[] = array(
   array(
     'data' => 'Library Name',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $library->name
 );

+ 2 - 1
tripal_organism/theme/tripal_organism/tripal_organism_base.tpl.php

@@ -29,7 +29,8 @@ $rows = array();
 $rows[] = array(
   array(
     'data' => 'Genus', 
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   '<i>' . $organism->genus . '</i>'
 );

+ 2 - 1
tripal_project/theme/tripal_project/tripal_project_base.tpl.php

@@ -41,7 +41,8 @@ $rows = array();
 $rows[] = array(
   array(
     'data' => 'Project Name',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $project->name
 );

+ 0 - 1
tripal_project/tripal_project.install

@@ -129,7 +129,6 @@ function tripal_project_add_cvterms() {
 /**
  * This is the required update for tripal_project when upgrading from Drupal core API 6.x.
  *
- * @ingroup tripal_project
  */
 function tripal_project_update_7200() {
   

+ 8 - 3
tripal_pub/theme/tripal_pub/pub_types/conference_proceedings.inc

@@ -26,7 +26,8 @@ else {
 $rows[] = array(
   array(
     'data' => 'Title',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $title,
 );
@@ -101,9 +102,13 @@ if (user_access('access administration pages')) {
   $rows[] = array(
     array(
       'data' => 'Pub ID',
-      'header' => TRUE
+      'header' => TRUE,
+      'class' => 'tripal-site-admin-only-table-row',
+    ),
+    array(
+      'data' => $pub->pub_id,
+      'class' => 'tripal-site-admin-only-table-row',
     ),
-    $pub->pub_id
   );
 }
 // Is Obsolete Row

+ 8 - 3
tripal_pub/theme/tripal_pub/pub_types/journal_article.inc

@@ -26,7 +26,8 @@ else {
 $rows[] = array(
   array(
     'data' => 'Title',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $title,
 );
@@ -101,9 +102,13 @@ if (user_access('access administration pages')) {
   $rows[] = array(
     array(
       'data' => 'Pub ID',
-      'header' => TRUE
+      'header' => TRUE,
+      'class' => 'tripal-site-admin-only-table-row',
+    ),
+    array(
+      'data' => $pub->pub_id,
+      'class' => 'tripal-site-admin-only-table-row',
     ),
-    $pub->pub_id
   );
 }
 // Is Obsolete Row

+ 8 - 3
tripal_pub/theme/tripal_pub/pub_types/patent.inc

@@ -26,7 +26,8 @@ else {
 $rows[] = array(
   array(
     'data' => 'Title',
-    'header' => TRUE
+    'header' => TRUE,
+    'width' => '20%',
   ),
   $title,
 );
@@ -77,9 +78,13 @@ if (user_access('access administration pages')) {
   $rows[] = array(
     array(
       'data' => 'Pub ID',
-      'header' => TRUE
+      'header' => TRUE,
+      'class' => 'tripal-site-admin-only-table-row',
+    ),
+    array(
+      'data' => $pub->pub_id,
+      'class' => 'tripal-site-admin-only-table-row',
     ),
-    $pub->pub_id
   );
 }
 // Is Obsolete Row

+ 2 - 1
tripal_pub/theme/tripal_pub/tripal_pub_base.tpl.php

@@ -129,7 +129,8 @@ else {
   $rows[] = array(
     array(
       'data' => 'Title',
-      'header' => TRUE
+      'header' => TRUE,
+      'width' => '20%',
     ),
     $title,
   );

+ 0 - 1
tripal_pub/tripal_pub.install

@@ -243,7 +243,6 @@ function tripal_pub_add_cvterms() {
 /**
  * This is the required update for tripal_contact when upgrading from Drupal core API 6.x.
  *
- * @ingroup tripal_pub
  */
 function tripal_pub_update_7200() {
 

+ 1 - 0
tripal_stock/theme/tripal_stock/tripal_stock_base.tpl.php

@@ -27,6 +27,7 @@ $rows[] = array(
   array(
     'data' => 'Name',
     'header' => TRUE,
+    'width' => '20%',
   ),
   $stock->name
 );

+ 0 - 1
tripal_views/tripal_views.install

@@ -133,7 +133,6 @@ function tripal_views_update_6040() {
  *   - Add relationship_only field to tripal_views_join
  *   - Add relationship_handler field to tripal_views_join
  *
- * @ingroup tripal_views
  */
 function tripal_views_update_7200() {